From 9a47d19a465671ce6d83b33e18cc0b50bbb5e7e5 Mon Sep 17 00:00:00 2001 From: Roman Muntean Date: Wed, 23 Oct 2024 13:24:35 +0100 Subject: [PATCH 1/2] use only requirements.txt with explciit versions --- CONTRIBUTING.md | 4 ++-- ci-requirements.txt | 12 ------------ galaxy.yml | 2 +- requirements.txt | 7 +++++-- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 ci-requirements.txt diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bab64dc..8bfea77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,8 +21,8 @@ Contributions must meet a minimum criteria: * Docker CE * Python >= 3.6 * Creating a Python `venv` is highly recommended! -* Python modules listed in `ci-requirements.txt` - * Can be installed using `pip install -r ci-requirements.txt` +* Python modules listed in `requirements.txt` + * Can be installed using `pip install -r requirements.txt` * Repository cloned to `.../ansible_collections//` ## Dev Environment diff --git a/ci-requirements.txt b/ci-requirements.txt deleted file mode 100644 index 839a2e0..0000000 --- a/ci-requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -ansible -pywinrm -molecule==3.3.0 -molecule-docker -docker -ansible-lint -yamllint -passlib -jmespath -# Downgrade these while rest is incompatible -Jinja2<3.0.0 -MarkupSafe<2.0.0 diff --git a/galaxy.yml b/galaxy.yml index d8c63da..40ab7da 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -10,7 +10,7 @@ namespace: merative name: spm_toolbox # The version of the collection. Must be compatible with semantic versioning -version: 1.1.1 +version: 1.1.2 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/requirements.txt b/requirements.txt index 438dcce..839a2e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,12 @@ ansible pywinrm -molecule +molecule==3.3.0 molecule-docker docker ansible-lint yamllint passlib -jmespath \ No newline at end of file +jmespath +# Downgrade these while rest is incompatible +Jinja2<3.0.0 +MarkupSafe<2.0.0 From 5f2e007c407a84eda0b3003db106d1e2a2158ce7 Mon Sep 17 00:00:00 2001 From: Roman Muntean Date: Wed, 23 Oct 2024 13:27:08 +0100 Subject: [PATCH 2/2] usee working requirements form spm-middleware --- requirements.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index 839a2e0..1252384 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,10 @@ -ansible -pywinrm -molecule==3.3.0 -molecule-docker -docker -ansible-lint -yamllint -passlib -jmespath -# Downgrade these while rest is incompatible -Jinja2<3.0.0 -MarkupSafe<2.0.0 +ansible==8.7.0 +pywinrm==0.4.3 +molecule==6.0.3 +molecule-docker==2.1.0 +docker==7.1.0 +ansible-lint==6.22.2 +yamllint==1.35.1 +passlib==1.7.4 +jmespath==1.0.1 +requests==2.31.0