Update pip package versions in preparation of pip 20.3

When pip is upgraded to 20.3, the pip dependency resolver is much more
strict and will no longer install a combination of packages that is mutually
inconsistent[0].

These changes account for the fact that Shipyard imports Armada, Drydock,
Promenade, and Deckhand. Having said that, with pip 20.3, the pip
packages amongst those projects cannot conflict. A follow-up change may
be needed if more conflicts are found.

[0] https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-2-2020

Change-Id: Id75acea82ddf5d915a8b8805e076dac49cab800f

deckhand/tests/unit/engine/test_document_validation.py

@@ -64,8 +64,8 @@ class TestDocumentValidation(engine_test_base.TestDocumentValidationBase):
     @mock.patch.object(document_validation, 'jsonschema', autospec=True)
     def test_validation_failure_sanitizes_error_section_secrets(
             self, mock_jsonschema):
-        m_args = mock.Mock()
+        mock_jsonschema.Draft4Validator = mock.Mock()
-        mock_jsonschema.Draft4Validator(m_args).iter_errors.side_effect = [
+        mock_jsonschema.Draft4Validator().iter_errors.side_effect = [
             # Return empty list of errors for base schema and metadata
             # validator and pretend that 1 error is returned for next
             # validator.

doc/requirements.txt

@@ -10,7 +10,7 @@ sphinxcontrib-plantuml
 
 # NOTE(felipemonteiro): Required by RTD to make oslo.policy and
 # oslo.config sample generation work.
-oslo.config!=4.3.0,!=4.4.0,>=5.2.0 # Apache-2.0
+oslo.config>=7.0.0 # Apache-2.0
 oslo.policy>=1.33.1 # Apache-2.0
 
 # NOTE(gorshunovr): from ../requirements.txt
@@ -18,12 +18,12 @@ beaker==1.10.0
 deepdiff==3.3.0
 falcon==1.4.1
 jsonpath-ng==1.4.3
-jsonschema==2.6.0
+jsonschema>=3.0.1<4
 keystoneauth1==3.11.1
 networkx==2.2
 Paste==3.0.1
 PasteDeploy==1.5.2
 python-barbicanclient==4.7.0
 oslo.db==4.41.1
-oslo.log==3.40.1
+oslo.log==3.45.2
 Werkzeug==0.16.1

requirements.txt

@@ -2,48 +2,51 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking==2.0.0
+hacking>=3.0.1,<3.1.0
 
 alembic==1.0.1
+amqp<2.7,>=2.6.0
 beaker==1.10.0
-cryptography==2.3.1
+cryptography>=2.7
 deepdiff==3.3.0
 falcon==1.4.1
 jsonpath-ng==1.4.3
-jsonschema==2.6.0
+jsonschema>=3.0.1<4
-keystoneauth1==3.11.1
+keystoneauth1>=3.18.0
 keystonemiddleware==5.3.0
+kombu<4.7,>=4.6.10
 networkx==2.2
-oslo.cache==1.31.1
+oslo.cache==1.38.1
 oslo.concurrency==3.28.1
-oslo.config==6.6.2
+oslo.config==7.0.0
 oslo.context>=2.21.0
 oslo.messaging==9.1.1
 oslo.db==4.41.1
-oslo.log==3.40.1
+oslo.log==3.45.2
 oslo.middleware==3.36.0
 oslo.policy==1.40.1
-oslo.serialization==2.28.1
+oslo.serialization==2.29.2
-oslo.utils==3.40.2
+oslo.utils==3.42.1
-pbr==5.1.0
+pbr==5.4.5
 PasteDeploy==1.5.2
 Paste==3.0.1
 psycopg2-binary==2.8.4
 pylibyaml~=0.1
 pyyaml~=5.1
+python-dateutil>=2.8.1
 
 # TODO(alanmeadows)
 # this must match the container service
 # likely this should be imported from a
 # container sidecar long-term
 python-barbicanclient==4.7.0
-python-keystoneclient==3.18.0
+python-keystoneclient==3.22.0
 python-memcached==1.59
 
 Routes==2.4.1
-six==1.11.0
+six>=1.15.0
-stevedore==1.30.0
+stevedore>=1.30.0
-urllib3==1.24.3
+urllib3==1.25.9
 uwsgi~=2.0.19.1
 # To support profiling in non-prod
 Werkzeug==0.16.1

test-requirements.txt

@@ -2,10 +2,10 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-amqp==2.5.2
+amqp<2.7,>=2.6.0
 coverage==4.5.1
 fixtures==3.0.0
-python-subunit==1.3.0
+python-subunit>=1.4.0
 os-testr==1.0.0
 testrepository==0.0.20
 testtools==2.3.0
@@ -18,3 +18,5 @@ oslotest==3.7.0
 yq>=2.7.2
 tox
 pylibyaml~=0.1
+six>=1.15.0
+pyparsing>=2.1.0

tools/gate/roles/install-test-requirements/tasks/install-test-requirements.yaml

@@ -20,10 +20,10 @@
 - name: Install pip3 and gabbi
   shell: |
     set -xe;
-    apt-get install -y python-pip python3-pip \
+    apt-get install -y python3-pip \
       python-setuptools python3-setuptools
-    pip install --upgrade pip
+    pip3 install --upgrade pip
-    pip install -r test-requirements.txt
+    pip3 install -r test-requirements.txt
   args:
     chdir: "{{ zuul.project.src_dir }}"
   become: yes

tools/gate/roles/run-integration-tests/tasks/integration-tests.yaml

@@ -53,8 +53,8 @@
     # NOTE(felipemonteiro): We don't use a venv because they don't play nicely
     # with OpenStack-Helm, which is used to orchestrate various OpenStack
     # services in the integration script called below.
-    sudo -H -E pip install -e .
+    sudo -H -E pip3 install -e .
-    sudo -H -E pip install -r requirements.txt -r test-requirements.txt
+    sudo -H -E pip3 install -r requirements.txt -r test-requirements.txt
     pifpaf run postgresql -- ./tools/integration-tests.sh
   args:
     chdir: "{{ zuul.project.src_dir }}"