chore: replace ansible-base by new package ansible-core (#244)

This commit is contained in:
Robert Kaussow 2021-10-11 22:34:34 +02:00 committed by GitHub
parent 58336d35dd
commit 31a361cb43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 37 deletions

View File

@ -7,7 +7,7 @@ local PythonVersion(pyversion='3.7') = {
commands: [ commands: [
'pip install poetry poetry-dynamic-versioning -qq', 'pip install poetry poetry-dynamic-versioning -qq',
'poetry config experimental.new-installer false', 'poetry config experimental.new-installer false',
'poetry install -E ansible-base', 'poetry install -E ansible-core',
'poetry run pytest', 'poetry run pytest',
'poetry version', 'poetry version',
'poetry run ansible-later --help', 'poetry run ansible-later --help',
@ -48,7 +48,7 @@ local PipelineLint = {
commands: [ commands: [
'git fetch -tq', 'git fetch -tq',
'pip install poetry poetry-dynamic-versioning -qq', 'pip install poetry poetry-dynamic-versioning -qq',
'poetry install -E ansible-base', 'poetry install -E ansible-core',
'poetry run flake8 ./ansiblelater', 'poetry run flake8 ./ansiblelater',
], ],
}, },
@ -121,7 +121,7 @@ local PipelineSecurity = {
commands: [ commands: [
'git fetch -tq', 'git fetch -tq',
'pip install poetry poetry-dynamic-versioning -qq', 'pip install poetry poetry-dynamic-versioning -qq',
'poetry install -E ansible-base', 'poetry install -E ansible-core',
'poetry run bandit -r ./ansiblelater -x ./ansiblelater/test', 'poetry run bandit -r ./ansiblelater -x ./ansiblelater/test',
], ],
}, },

View File

@ -23,7 +23,7 @@ steps:
commands: commands:
- git fetch -tq - git fetch -tq
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry install -E ansible-base - poetry install -E ansible-core
- poetry run flake8 ./ansiblelater - poetry run flake8 ./ansiblelater
environment: environment:
PY_COLORS: 1 PY_COLORS: 1
@ -53,7 +53,7 @@ steps:
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry config experimental.new-installer false - poetry config experimental.new-installer false
- poetry install -E ansible-base - poetry install -E ansible-core
- poetry run pytest - poetry run pytest
- poetry version - poetry version
- poetry run ansible-later --help - poetry run ansible-later --help
@ -67,7 +67,7 @@ steps:
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry config experimental.new-installer false - poetry config experimental.new-installer false
- poetry install -E ansible-base - poetry install -E ansible-core
- poetry run pytest - poetry run pytest
- poetry version - poetry version
- poetry run ansible-later --help - poetry run ansible-later --help
@ -81,7 +81,7 @@ steps:
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry config experimental.new-installer false - poetry config experimental.new-installer false
- poetry install -E ansible-base - poetry install -E ansible-core
- poetry run pytest - poetry run pytest
- poetry version - poetry version
- poetry run ansible-later --help - poetry run ansible-later --help
@ -95,7 +95,7 @@ steps:
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry config experimental.new-installer false - poetry config experimental.new-installer false
- poetry install -E ansible-base - poetry install -E ansible-core
- poetry run pytest - poetry run pytest
- poetry version - poetry version
- poetry run ansible-later --help - poetry run ansible-later --help
@ -142,7 +142,7 @@ steps:
commands: commands:
- git fetch -tq - git fetch -tq
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry install -E ansible-base - poetry install -E ansible-core
- poetry run bandit -r ./ansiblelater -x ./ansiblelater/test - poetry run bandit -r ./ansiblelater -x ./ansiblelater/test
environment: environment:
PY_COLORS: 1 PY_COLORS: 1
@ -647,6 +647,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: a2bced882da541e336f413df113c0317eb4d1ca6f3164624e11069cfad699586 hmac: 978f8129485afdd50c04d9cf48b9cb7835ea4152d4688004d887827260fc7426
... ...

View File

@ -2,17 +2,17 @@
title: Using pip title: Using pip
--- ---
ansible-later requires a working Ansible installation. If Ansible is not already installed on your system you can to install `ansible-later` with one of the optional dependency groups `ansible` or `ansible-base`. ansible-later requires a working Ansible installation. If Ansible is not already installed on your system you can to install `ansible-later` with one of the optional dependency groups `ansible` or `ansible-core`.
<!-- prettier-ignore-start --> <!-- prettier-ignore-start -->
<!-- markdownlint-disable --> <!-- markdownlint-disable -->
<!-- spellchecker-disable --> <!-- spellchecker-disable -->
{{< highlight Shell "linenos=table" >}} {{< highlight Shell "linenos=table" >}}
# From pip as user # From pip as user
pip install ansible-later[ansible] --user # or ansible-later[ansible-base] pip install ansible-later[ansible] --user # or ansible-later[ansible-core]
# .. or as root # .. or as root
sudo pip install ansible-later[ansible] # or ansible-later[ansible-base] sudo pip install ansible-later[ansible] # or ansible-later[ansible-core]
{{< /highlight >}} {{< /highlight >}}
<!-- spellchecker-enable --> <!-- spellchecker-enable -->
<!-- markdownlint-restore --> <!-- markdownlint-restore -->

25
poetry.lock generated
View File

@ -9,23 +9,9 @@ python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
[package.dependencies] [package.dependencies]
ansible-core = ">=2.11.5,<2.12" ansible-core = ">=2.11.5,<2.12"
[[package]]
name = "ansible-base"
version = "2.10.14"
description = "Radically simple IT automation"
category = "main"
optional = true
python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
[package.dependencies]
cryptography = "*"
jinja2 = "*"
packaging = "*"
PyYAML = "*"
[[package]] [[package]]
name = "ansible-core" name = "ansible-core"
version = "2.11.5" version = "2.11.6"
description = "Radically simple IT automation" description = "Radically simple IT automation"
category = "main" category = "main"
optional = true optional = true
@ -720,22 +706,19 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes
[extras] [extras]
ansible = ["ansible"] ansible = ["ansible"]
ansible-base = ["ansible-base"] ansible-core = ["ansible-core"]
[metadata] [metadata]
lock-version = "1.1" lock-version = "1.1"
python-versions = "^3.7.0" python-versions = "^3.7.0"
content-hash = "cc9228f9aa6e3ccc9e074ac70a3f7932bb57db4c825a1839929f07bbb3fea16b" content-hash = "f178b2964b40a82c1f077375abf5a9a39c5417c7b90a9d76a9cbbdc55aeccbcf"
[metadata.files] [metadata.files]
ansible = [ ansible = [
{file = "ansible-4.6.0.tar.gz", hash = "sha256:2955fcbf51367f8bd88c38a86f8be83d4fcd05f778afb4feed31abfe8dcff639"}, {file = "ansible-4.6.0.tar.gz", hash = "sha256:2955fcbf51367f8bd88c38a86f8be83d4fcd05f778afb4feed31abfe8dcff639"},
] ]
ansible-base = [
{file = "ansible-base-2.10.14.tar.gz", hash = "sha256:800c4646c58a5897f71f2230167db5626a196deba208f0ef4560a183ffd9dfda"},
]
ansible-core = [ ansible-core = [
{file = "ansible-core-2.11.5.tar.gz", hash = "sha256:7d3ce47014122907454704363485e48513f8ad0f00138b88870eb6d88953d121"}, {file = "ansible-core-2.11.6.tar.gz", hash = "sha256:93d50283c7c5b476debf83dc089b3f679b939a8b9a7b5d628d28daafbb3d303a"},
] ]
anyconfig = [ anyconfig = [
{file = "anyconfig-0.12.0-py2.py3-none-any.whl", hash = "sha256:2119065ad835d0e4cbcb26a58fab0705952c5657c05fa90ef7a11cdecbbafb1f"}, {file = "anyconfig-0.12.0-py2.py3-none-any.whl", hash = "sha256:2119065ad835d0e4cbcb26a58fab0705952c5657c05fa90ef7a11cdecbbafb1f"},

View File

@ -36,7 +36,7 @@ version = "0.0.0"
[tool.poetry.dependencies] [tool.poetry.dependencies]
PyYAML = "5.4.1" PyYAML = "5.4.1"
ansible = {version = "4.6.0", optional = true} ansible = {version = "4.6.0", optional = true}
ansible-base = {version = "2.10.14", optional = true} ansible-core = {version = "2.11.6", optional = true}
anyconfig = "0.12.0" anyconfig = "0.12.0"
appdirs = "1.4.4" appdirs = "1.4.4"
colorama = "0.4.4" colorama = "0.4.4"
@ -71,7 +71,7 @@ yapf = "0.31.0"
[tool.poetry.extras] [tool.poetry.extras]
ansible = ["ansible"] ansible = ["ansible"]
ansible-base = ["ansible-base"] ansible-core = ["ansible-core"]
[tool.poetry.scripts] [tool.poetry.scripts]
ansible-later = "ansiblelater.__main__:main" ansible-later = "ansiblelater.__main__:main"

View File

@ -5,7 +5,7 @@
{ {
"description": "Ansible base dependencies", "description": "Ansible base dependencies",
"groupName": "ansible packages", "groupName": "ansible packages",
"matchPackageNames": ["ansible", "ansible-base"] "matchPackageNames": ["ansible", "ansible-core"]
} }
] ]
} }