majic-ansible-roles Changeset

Changeset - e3b83798eaba

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Branko Majic (branko) - 3 years ago 2020-11-10 17:00:53
branko@majic.rs

MAR-167: Update default requirements for pipreqcheck and fix the deprecation warning for pip-compile.

3 files changed with 21 insertions and 21 deletions:

roles/common/defaults/main.yml

roles/common/files/pip_check_requirements_upgrades.sh

roles/common/molecule/default/tests/test_default.py

0 comments (0 inline, 0 general)

roles/common/defaults/main.yml

➞

Show inline comments

@@ @@ -14,18 +14,18 @@ extra_backup_patterns: @@
   - "/home"
 pip_check_requirements:
   - click==7.1.2
   - pip-tools==5.1.2
   - pip==20.1
   - setuptools==44.1.0
   - six==1.14.0
   - wheel==0.34.2
   - pip-tools==5.3.1
   - pip==20.2.4
   - setuptools==44.1.1
   - six==1.15.0
   - wheel==0.35.1
 pip_check_requirements_py3:
   - click==7.1.2
   - pip-tools==5.1.2
   - pip==20.1
   - setuptools==46.1.3
   - six==1.14.0
   - wheel==0.34.2
   - pip-tools==5.3.1
   - pip==20.2.4
   - setuptools==50.3.2
   - six==1.15.0
   - wheel==0.35.1
 ntp_servers: []
 # Internal use only.

roles/common/files/pip_check_requirements_upgrades.sh

➞

Show inline comments

@@ @@ -238,7 +238,7 @@ for environment in "$config_dir"/*; do @@
         current=$(sed -e 's/[[:blank:]]*#.*//' "$req_txt" | grep -v "^$" | sort -u)
         # Calculate up-to-date requirements.
         new=$(pip-compile --quiet --allow-unsafe --no-header --no-annotate --no-index --output-file - --upgrade "$req_in")
+        new=$(pip-compile --quiet --allow-unsafe --no-header --no-annotate --no-emit-index-url --output-file - --upgrade "$req_in")
         result="$?"
         if [[ $result != 0 ]]; then
              error "Failed while running pip-compile command against (see error stack trace above): $req_in"

roles/common/molecule/default/tests/test_default.py

➞

Show inline comments

 @pytest.mark.parametrize("pip_path, expected_packages",  [
     ('/var/lib/pipreqcheck/virtualenv/bin/pip', [
         "click==7.1.2",
         "pip-tools==5.1.2",
         "pip==20.1",
         "setuptools==44.1.0",
         "six==1.14.0",
         "wheel==0.34.2",
         "pip-tools==5.3.1",
         "pip==20.2.4",
         "setuptools==44.1.1",
         "six==1.15.0",
         "wheel==0.35.1",
     ]),
     ('/var/lib/pipreqcheck/virtualenv-py3/bin/pip', [
         "click==7.1.2",
         "pip-tools==5.1.2",
         "pip==20.1",
         "setuptools==46.1.3",
         "six==1.14.0",
         "wheel==0.34.2",
         "pip-tools==5.3.1",
         "pip==20.2.4",
         "setuptools==50.3.2",
         "six==1.15.0",
         "wheel==0.35.1",
     ]),
 ])
 def test_pipreqcheck_virtualenv_packages(host, pip_path, expected_packages):

0 comments (0 inline, 0 general)