From e3b83798eababe6c0b1e63506cce1f9ee24bd35c 2020-11-10 17:00:53
From: Branko Majic <branko@majic.rs>
Date: 2020-11-10 17:00:53
Subject: [PATCH] MAR-167: Update default requirements for pipreqcheck and fix the deprecation warning for pip-compile.

---

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index 4508c3555ec4a79e714730e6378bf16a3c1f99dc..8302fbebdf061e28b2302160189e086ad858eefe 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -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.
diff --git a/roles/common/files/pip_check_requirements_upgrades.sh b/roles/common/files/pip_check_requirements_upgrades.sh
index 457d1c9a1560fc2601e44fa1d6f73c73ffd95c24..168c5e3256033846dcc0ca17078e067584dff8a5 100755
--- a/roles/common/files/pip_check_requirements_upgrades.sh
+++ b/roles/common/files/pip_check_requirements_upgrades.sh
@@ -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"
diff --git a/roles/common/molecule/default/tests/test_default.py b/roles/common/molecule/default/tests/test_default.py
index 89c6047e75faec911565c444d66e8dd89cd53884..4d34e78064feec4ddb6a088edaf0730f6182576f 100644
--- a/roles/common/molecule/default/tests/test_default.py
+++ b/roles/common/molecule/default/tests/test_default.py
@@ -307,19 +307,19 @@ def test_pipreqcheck_requirements(host, requirements_in_path, requirements_txt_p
 @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):