mirror of
https://github.com/arcan1s/ahriman.git
synced 2025-11-21 07:53:42 +00:00
Compare commits
1 Commits
master
...
a28589ec74
| Author | SHA1 | Date | |
|---|---|---|---|
| a28589ec74 |
@ -57,7 +57,7 @@ class ConfigurationMultiDict(dict[str, Any]):
|
|||||||
OptionError: if the key already exists in the dictionary, but not a single value list or a string
|
OptionError: if the key already exists in the dictionary, but not a single value list or a string
|
||||||
"""
|
"""
|
||||||
match self.get(key):
|
match self.get(key):
|
||||||
case [current_value] | (str() as current_value):
|
case [current_value] | str(current_value):
|
||||||
value = f"{current_value} {value}"
|
value = f"{current_value} {value}"
|
||||||
case None:
|
case None:
|
||||||
pass
|
pass
|
||||||
|
|||||||
@ -47,7 +47,6 @@ class LogsRotationTrigger(Trigger):
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
REQUIRES_REPOSITORY = True
|
|
||||||
|
|
||||||
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -336,7 +336,6 @@ class ReportTrigger(Trigger):
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
REQUIRES_REPOSITORY = True
|
|
||||||
|
|
||||||
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -103,7 +103,6 @@ class KeyringTrigger(Trigger):
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
REQUIRES_REPOSITORY = True
|
|
||||||
|
|
||||||
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -90,7 +90,6 @@ class MirrorlistTrigger(Trigger):
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
REQUIRES_REPOSITORY = True
|
|
||||||
|
|
||||||
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -160,7 +160,6 @@ class UploadTrigger(Trigger):
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
REQUIRES_REPOSITORY = True
|
|
||||||
|
|
||||||
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -7,13 +7,6 @@ from ahriman.core.status import Client
|
|||||||
from ahriman.models.result import Result
|
from ahriman.models.result import Result
|
||||||
|
|
||||||
|
|
||||||
def test_requires_repository() -> None:
|
|
||||||
"""
|
|
||||||
must require repository identifier to be set to start
|
|
||||||
"""
|
|
||||||
assert LogsRotationTrigger.REQUIRES_REPOSITORY
|
|
||||||
|
|
||||||
|
|
||||||
def test_configuration_sections(configuration: Configuration) -> None:
|
def test_configuration_sections(configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
must correctly parse target list
|
must correctly parse target list
|
||||||
|
|||||||
@ -5,13 +5,6 @@ from ahriman.core.report import ReportTrigger
|
|||||||
from ahriman.models.result import Result
|
from ahriman.models.result import Result
|
||||||
|
|
||||||
|
|
||||||
def test_requires_repository() -> None:
|
|
||||||
"""
|
|
||||||
must require repository identifier to be set to start
|
|
||||||
"""
|
|
||||||
assert ReportTrigger.REQUIRES_REPOSITORY
|
|
||||||
|
|
||||||
|
|
||||||
def test_configuration_sections(configuration: Configuration) -> None:
|
def test_configuration_sections(configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
must correctly parse target list
|
must correctly parse target list
|
||||||
|
|||||||
@ -7,13 +7,6 @@ from ahriman.core.sign.gpg import GPG
|
|||||||
from ahriman.core.support import KeyringTrigger
|
from ahriman.core.support import KeyringTrigger
|
||||||
|
|
||||||
|
|
||||||
def test_requires_repository() -> None:
|
|
||||||
"""
|
|
||||||
must require repository identifier to be set to start
|
|
||||||
"""
|
|
||||||
assert KeyringTrigger.REQUIRES_REPOSITORY
|
|
||||||
|
|
||||||
|
|
||||||
def test_configuration_sections(configuration: Configuration) -> None:
|
def test_configuration_sections(configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
must correctly parse target list
|
must correctly parse target list
|
||||||
|
|||||||
@ -4,13 +4,6 @@ from ahriman.core.configuration import Configuration
|
|||||||
from ahriman.core.support import MirrorlistTrigger
|
from ahriman.core.support import MirrorlistTrigger
|
||||||
|
|
||||||
|
|
||||||
def test_requires_repository() -> None:
|
|
||||||
"""
|
|
||||||
must require repository identifier to be set to start
|
|
||||||
"""
|
|
||||||
assert MirrorlistTrigger.REQUIRES_REPOSITORY
|
|
||||||
|
|
||||||
|
|
||||||
def test_configuration_sections(configuration: Configuration) -> None:
|
def test_configuration_sections(configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
must correctly parse target list
|
must correctly parse target list
|
||||||
|
|||||||
@ -5,13 +5,6 @@ from ahriman.core.upload import UploadTrigger
|
|||||||
from ahriman.models.result import Result
|
from ahriman.models.result import Result
|
||||||
|
|
||||||
|
|
||||||
def test_requires_repository() -> None:
|
|
||||||
"""
|
|
||||||
must require repository identifier to be set to start
|
|
||||||
"""
|
|
||||||
assert UploadTrigger.REQUIRES_REPOSITORY
|
|
||||||
|
|
||||||
|
|
||||||
def test_configuration_sections(configuration: Configuration) -> None:
|
def test_configuration_sections(configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
must correctly parse target list
|
must correctly parse target list
|
||||||
|
|||||||
14
tox.toml
14
tox.toml
@ -140,6 +140,8 @@ dynamic_version = "{[project]name}.__version__"
|
|||||||
extras = [
|
extras = [
|
||||||
{ replace = "ref", of = ["project", "extras"], extend = true },
|
{ replace = "ref", of = ["project", "extras"], extend = true },
|
||||||
]
|
]
|
||||||
|
# TODO: steamline shlex usage after https://github.com/iterative/shtab/pull/192 merge
|
||||||
|
handle_redirect = true
|
||||||
pip_pre = true
|
pip_pre = true
|
||||||
set_env.PYTHONPATH = "src"
|
set_env.PYTHONPATH = "src"
|
||||||
set_env.SPHINX_APIDOC_OPTIONS = "members,no-undoc-members,show-inheritance"
|
set_env.SPHINX_APIDOC_OPTIONS = "members,no-undoc-members,show-inheritance"
|
||||||
@ -147,14 +149,18 @@ commands = [
|
|||||||
[
|
[
|
||||||
"shtab",
|
"shtab",
|
||||||
{ replace = "ref", of = ["flags", "shtab"], extend = true },
|
{ replace = "ref", of = ["flags", "shtab"], extend = true },
|
||||||
"--shell", "bash",
|
"--shell",
|
||||||
"--output", "package/share/bash-completion/completions/_ahriman",
|
"bash",
|
||||||
|
">",
|
||||||
|
"package/share/bash-completion/completions/_ahriman",
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"shtab",
|
"shtab",
|
||||||
{ replace = "ref", of = ["flags", "shtab"], extend = true },
|
{ replace = "ref", of = ["flags", "shtab"], extend = true },
|
||||||
"--shell", "zsh",
|
"--shell",
|
||||||
"--output", "package/share/zsh/site-functions/_ahriman",
|
"zsh",
|
||||||
|
">",
|
||||||
|
"package/share/zsh/site-functions/_ahriman",
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"argparse-manpage",
|
"argparse-manpage",
|
||||||
|
|||||||
39
toxfile.py
39
toxfile.py
@ -18,9 +18,11 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
import importlib
|
import importlib
|
||||||
|
import shlex
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from tox.config.sets import EnvConfigSet
|
from tox.config.sets import EnvConfigSet
|
||||||
|
from tox.config.types import Command
|
||||||
from tox.plugin import impl
|
from tox.plugin import impl
|
||||||
from tox.session.state import State
|
from tox.session.state import State
|
||||||
from tox.tox_env.api import ToxEnv
|
from tox.tox_env.api import ToxEnv
|
||||||
@ -54,6 +56,35 @@ def _extract_version(env_conf: EnvConfigSet, python_path: str | None = None) ->
|
|||||||
return {"VERSION": version}
|
return {"VERSION": version}
|
||||||
|
|
||||||
|
|
||||||
|
def _wrap_commands(env_conf: EnvConfigSet, shell: str = "bash") -> None:
|
||||||
|
"""
|
||||||
|
wrap commands into shell if there is redirect
|
||||||
|
|
||||||
|
Args:
|
||||||
|
env_conf(EnvConfigSet): the core configuration object
|
||||||
|
shell(str, optional): shell command to use (Default value = "bash")
|
||||||
|
"""
|
||||||
|
if not env_conf["handle_redirect"]:
|
||||||
|
return
|
||||||
|
|
||||||
|
# append shell just in case
|
||||||
|
env_conf["allowlist_externals"].append(shell)
|
||||||
|
|
||||||
|
for command in env_conf["commands"]:
|
||||||
|
if len(command.args) < 3: # command itself, redirect and output
|
||||||
|
continue
|
||||||
|
|
||||||
|
redirect, output = command.args[-2:]
|
||||||
|
if redirect not in (">", "2>", "&>"):
|
||||||
|
continue
|
||||||
|
|
||||||
|
command.args = [
|
||||||
|
shell,
|
||||||
|
"-c",
|
||||||
|
f"{Command(command.args[:-2]).shell} {redirect} {shlex.quote(output)}",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
@impl
|
@impl
|
||||||
def tox_add_env_config(env_conf: EnvConfigSet, state: State) -> None:
|
def tox_add_env_config(env_conf: EnvConfigSet, state: State) -> None:
|
||||||
"""
|
"""
|
||||||
@ -72,6 +103,12 @@ def tox_add_env_config(env_conf: EnvConfigSet, state: State) -> None:
|
|||||||
default="",
|
default="",
|
||||||
desc="import path for the version variable",
|
desc="import path for the version variable",
|
||||||
)
|
)
|
||||||
|
env_conf.add_config(
|
||||||
|
keys=["handle_redirect"],
|
||||||
|
of_type=bool,
|
||||||
|
default=False,
|
||||||
|
desc="wrap commands to handle redirects if any",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@impl
|
@impl
|
||||||
@ -87,3 +124,5 @@ def tox_before_run_commands(tox_env: ToxEnv) -> None:
|
|||||||
|
|
||||||
python_path = set_env.load("PYTHONPATH") if "PYTHONPATH" in set_env else None
|
python_path = set_env.load("PYTHONPATH") if "PYTHONPATH" in set_env else None
|
||||||
set_env.update(_extract_version(env_conf, python_path))
|
set_env.update(_extract_version(env_conf, python_path))
|
||||||
|
|
||||||
|
_wrap_commands(env_conf)
|
||||||
|
|||||||
Reference in New Issue
Block a user