Merge "Update requirements"

2020-03-24 23:13:04 +00:00 · 2020-03-24 23:13:04 +00:00 · 164314bcc6
parent 0fad5c34d9 b883351e05
commit 164314bcc6
4 changed files with 149 additions and 153 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,36 +1,35 @@
-# The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.

-requests>=2.14.2                                       # Apache License, Version 2.0
+requests!=2.20.0                                       # Apache License, Version 2.0

-rally>=0.11.0                                          # Apache License, Version 2.0
+rally>=0.11.0                                           # Apache License, Version 2.0

 # OpenStack related
-gnocchiclient>=3.3.1                                   # Apache Software License
-keystoneauth1>=3.3.0                                   # Apache Software License
-kubernetes>=11.0.0                                     # Apache License Version 2.0
+gnocchiclient                                          # Apache Software License
+keystoneauth1                                          # Apache Software License
+kubernetes                                             # Apache License Version 2.0
 os-faults>=0.2.0                                       # Apache Software License
-osprofiler>=1.4.0                                      # Apache Software License
-python-barbicanclient>=4.5.2                           # Apache Software License
-python-ceilometerclient>=2.5.0                         # Apache Software License
-python-cinderclient>=3.3.0                             # Apache Software License
-python-designateclient>=2.7.0                          # Apache License, Version 2.0
-python-heatclient>=1.10.0                              # Apache Software License
-python-glanceclient>=2.8.0                             # Apache License, Version 2.0
-python-ironicclient>=2.2.0                             # Apache Software License
-python-keystoneclient>=3.8.0                           # Apache Software License
-python-magnumclient>=2.1.0                             # Apache Software License
-python-manilaclient>=1.16.0                            # Apache Software License
-python-mistralclient>=3.1.0,!=3.2.0                    # Apache Software License
-python-muranoclient>=0.8.2                             # Apache License, Version 2.0
-python-monascaclient>=1.7.0                            # Apache Software License
-python-neutronclient>=6.3.0                            # Apache Software License
-python-novaclient>=9.1.0                               # Apache License, Version 2.0
-python-octaviaclient>=1.4.0                            # Apache License, Version 2.0
-python-saharaclient>=1.4.0                             # Apache License, Version 2.0
-python-senlinclient>=1.1.0                             # Apache Software License
-python-swiftclient>=3.2.0                              # Apache Software License
-python-troveclient>=2.2.0                              # Apache Software License
-python-watcherclient>=1.1.0                            # Apache Software License
-python-zaqarclient>=1.0.0                              # Apache Software License
+osprofiler                                             # Apache Software License
+python-barbicanclient                                  # Apache Software License
+python-ceilometerclient                                # Apache Software License
+python-cinderclient!=4.0.0                             # Apache Software License
+python-designateclient                                 # Apache License, Version 2.0
+python-heatclient                                      # Apache Software License
+python-glanceclient                                    # Apache License, Version 2.0
+python-ironicclient!=2.5.2,!=2.7.1,!=3.0.0             # Apache Software License
+python-keystoneclient!=2.1.0                           # Apache Software License
+python-magnumclient                                    # Apache Software License
+python-manilaclient                                    # Apache Software License
+python-mistralclient!=3.2.0                            # Apache Software License
+python-muranoclient                                    # Apache License, Version 2.0
+python-monascaclient                                   # Apache Software License
+python-neutronclient                                   # Apache Software License
+python-novaclient                                      # Apache License, Version 2.0
+python-octaviaclient                                   # Apache Software License
+python-saharaclient                                    # Apache License, Version 2.0
+python-senlinclient                                    # Apache Software License
+python-swiftclient                                     # Apache Software License
+python-troveclient                                     # Apache Software License
+python-watcherclient                                   # Apache Software License
+python-zaqarclient                                     # Apache Software License
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -8,16 +8,15 @@ pytest<=5.3                                            # MIT
 # py.test plugin for measuring coverage.
 pytest-cov>=2.2.1                                      # MIT
 # py.test plugin for generating HTML reports
-pytest-html>=1.10.0                                    # Mozilla Public License 2.0 (MPL 2.0)
+pytest-html                                            # Mozilla Public License 2.0 (MPL 2.0)
 # py.test xdist plugin for distributed testing and loop-on-failing modes
 pytest-xdist                                           # MIT

 coverage!=4.4                                          # Apache License, Version 2.0
 ddt                                                    # MIT
-mock                                                   # UNKNOWN
 python-dateutil                                        # Dual License
-testtools                                              # UNKNOWN
+testtools                                              # MIT

-sphinx!=1.6.6,!=1.6.7                                  # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0                          # BSD
 oslosphinx                                             # Apache Software License
 oslotest                                               # Apache Software License
--- a/tox.ini
+++ b/tox.ini
@ -91,4 +91,18 @@ commands = bindep
 commands = {toxinidir}/tests/ci/rally_self_job.sh {toxinidir}/rally-jobs/self-rally.yaml

 [pytest]
-addopts = -p no:warnings
+filterwarnings =
+    error
+    ignore:.*EngineFacade is deprecated; please use oslo_db.sqlalchemy.enginefacade*:
+    # instead of ignoring all modules, let's list only libraries that are failing
+    ignore:invalid escape sequence:DeprecationWarning:.*netaddr.*
+    ignore:invalid escape sequence:DeprecationWarning:.*prettytable
+    ignore:invalid escape sequence:DeprecationWarning:.*subunit.*
+    ignore:invalid escape sequence:DeprecationWarning:.*testtools.*
+    # new to rally-openstack
+    ignore:::.*rally.*
+    ignore:Using or importing the ABCs:DeprecationWarning:.*oslo_context.*
+    # python 3.7
+    ignore:Using or importing the ABCs:DeprecationWarning:unittest2.*
+    # python 3.8
+    ignore:::.*netaddr.strategy.*
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@ -1,150 +1,134 @@
-adal===1.1.0
-alembic===0.9.7
+alembic===1.3.3
 appdirs===1.4.3
-argparse===1.2.1
-asn1crypto===0.24.0
-Babel===2.6.0
-bcrypt===3.1.4
-cachetools===2.1.0
-certifi===2018.8.24
-cffi===1.11.5
+argparse===1.4.0
+attrs===19.3.0
+Babel===2.8.0
+bcrypt===3.1.7
+cachetools===4.0.0
+certifi===2019.11.28
+cffi===1.14.0
 chardet===3.0.4
-Click===7.0
-cliff===2.13.0
-cmd2===0.8.8;python_version=='2.7'
-cmd2===0.9.3;python_version=='3.4'
-cmd2===0.9.3;python_version=='3.5'
-cmd2===0.9.3;python_version=='3.6'
-cmd2===0.9.3;python_version=='3.7'
-contextlib2===0.5.5
-cryptography===2.3.1
-debtcollector===1.20.0
-decorator===4.3.0
-deprecation===2.0.6
-docutils===0.14
-dogpile.cache===0.6.7
-enum34===1.1.6
+click===7.1.1
+cliff===3.0.0
+cmd2===0.8.9
+cryptography===2.8
+debtcollector===2.0.0
+decorator===4.4.2
+distlib===0.3.0
+dogpile.cache===0.9.0
 extras===1.0.0
 fasteners===0.14.1
+filelock===3.0.12
 fixtures===3.0.0
-funcsigs===1.0.2
-functools32===3.2.3.post2
-futures===3.2.0
-futurist===1.7.0
-gnocchiclient===7.0.5
-google-auth===1.5.1
-idna===2.7
-ipaddress===1.0.22
+futurist===2.1.0
+gnocchiclient===7.0.6
+google-auth===1.11.3
+idna===2.9
+importlib-metadata===1.5.0
+importlib-resources===1.4.0
 iso8601===0.1.12
-Jinja2===2.10
-jmespath===0.9.3
-jsonpatch===1.23
+Jinja2===2.11.1
+jmespath===0.9.5
+jsonpatch===1.25
 jsonpointer===2.0
-jsonschema===3.0.2
-keystoneauth1===3.11.0
+jsonschema===3.2.0
+keystoneauth1===3.18.0
 kubernetes===11.0.0
 linecache2===1.0.0
-Mako===1.0.7
+Mako===1.1.2
 MarkupSafe===1.1.1
 monotonic===1.5
-morph===0.1.4
-msgpack===0.5.6
-munch===2.3.2
+msgpack===0.6.2
+munch===2.5.0
 murano-pkg-check===0.3.0
 netaddr===0.7.19
-netifaces===0.10.7
-oauthlib===2.1.0
-openstacksdk===0.17.2
-os-client-config===1.31.2
+netifaces===0.10.9
+oauthlib===3.1.0
+openstacksdk===0.43.0
+os-client-config===2.0.0
 os-faults===0.2.5
-os-service-types===1.3.0
-osc-lib===1.11.1
-oslo.concurrency===3.28.1
-oslo.config===6.5.1
-oslo.context===2.21.0
-oslo.db===4.41.1
-oslo.i18n===3.23.0
-oslo.log===3.40.1
-oslo.serialization===2.28.1
-oslo.utils===3.37.0
-osprofiler===2.4.1
-packaging===18.0
-paramiko===2.4.2
-pbr===4.3.0
-pip===18.1
+os-service-types===1.7.0
+osc-lib===2.0.0
+oslo.concurrency===4.0.1
+oslo.config===8.0.1
+oslo.context===3.0.0
+oslo.db===8.0.0
+oslo.i18n===4.0.0
+oslo.log===4.1.0
+oslo.serialization===3.1.0
+oslo.utils===4.1.0
+osprofiler===3.0.0
+paramiko===2.7.1
+pbr===5.4.4
+pip===19.1.1
 ply===3.11
 prettytable===0.7.2
-pyasn1===0.4.4
-pyasn1-modules===0.2.2
-pycparser===2.19
-pyghmi===1.2.14
+pyasn1===0.4.8
+pyasn1-modules===0.2.8
+pycparser===2.20
+pyghmi===1.5.13
 pyinotify===0.9.6
-PyJWT===1.6.4
 PyNaCl===1.3.0
-pyOpenSSL===18.0.0
-pyparsing===2.2.2
+pyOpenSSL===19.1.0
+pyparsing===2.4.6
 pyperclip===1.7.0
-Python===2.7.15rc1
-python-barbicanclient===4.5.2
+pyrsistent===0.15.7
+python-barbicanclient===4.10.0
 python-ceilometerclient===2.9.0
-python-cinderclient===5.0.0
-python-dateutil===2.7.3
-python-designateclient===3.0.0
-python-editor===1.0.3
-python-glanceclient===2.12.1
-python-heatclient===1.16.1
-python-ironicclient===2.8.0
-python-keystoneclient===3.17.0
-python-magnumclient===2.10.0
-python-manilaclient===1.24.1
+python-cinderclient===6.0.0
+python-dateutil===2.8.1
+python-designateclient===3.1.0
+python-editor===1.0.4
+python-glanceclient===3.0.0
+python-heatclient===2.0.0
+python-ironicclient===4.0.0
+python-keystoneclient===3.22.0
+python-magnumclient===2.17.0
+python-manilaclient===2.0.0
 python-mimeparse===1.6.0
-python-mistralclient===3.7.0
-python-monascaclient===1.12.1
-python-muranoclient===1.1.1
-python-neutronclient===6.10.0
-python-novaclient===11.0.0
-python-octaviaclient===1.6.0
-python-openstackclient===3.16.1
-python-saharaclient===2.0.0
-python-senlinclient===1.8.0
-python-subunit===1.3.0
-python-swiftclient===3.6.0
-python-troveclient===2.16.0
-python-watcherclient===2.1.0
-python-zaqarclient===1.12.0
-pytz===2018.5
-PyYAML===3.13
+python-mistralclient===4.0.0
+python-monascaclient===2.0.0
+python-muranoclient===2.0.0
+python-neutronclient===7.1.0
+python-novaclient===16.0.0
+python-octaviaclient===2.0.0
+python-openstackclient===5.0.0
+python-saharaclient===3.0.0
+python-senlinclient===2.0.0
+python-subunit===1.4.0
+python-swiftclient===3.9.0
+python-troveclient===3.3.0
+python-watcherclient===2.5.0
+python-zaqarclient===1.13.0
+pytz===2019.3
+PyYAML===5.3.1
 rally===2.1.0
-requests===2.22.0
-requests-oauthlib===1.0.0
+requests===2.23.0
+requests-oauthlib===1.3.0
 requestsexceptions===1.4.0
-rfc3986===1.1.0
+rfc3986===1.3.2
 rsa===4.0
-semantic-version===2.6.0
-setuptools===40.4.3
-simplejson===3.16.0
-six===1.11.0
-Sphinx==1.8.5;python_version=='2.7'
-SQLAlchemy===1.3.4
-sqlalchemy-migrate===0.12.0
-sqlparse===0.2.4
-stevedore===1.29.0
-subprocess32===3.5.2
+semantic-version===2.8.4
+setuptools===41.0.1
+simplejson===3.17.0
+SQLAlchemy===1.3.15
+sqlalchemy-migrate===0.13.0
+sqlparse===0.3.1
+stevedore===1.32.0
 Tempita===0.5.2
 testresources===2.0.1
 testscenarios===0.5.0
-testtools===2.3.0
+testtools===2.4.0
 traceback2===1.4.0
-ujson===1.35
-unicodecsv===0.14.1
+ujson===2.0.2
 unittest2===1.1.0
-urllib3===1.25.3
-virtualenv===16.0.0
+urllib3===1.25.8
+virtualenv===20.0.13
 warlock===1.3.3
-wcwidth===0.1.7
-WebOb===1.8.2
-websocket-client===0.53.0
-wheel===0.32.1
-wrapt===1.10.11
-wsgiref===0.1.2
+wcwidth===0.1.8
+WebOb===1.8.6
+websocket-client===0.57.0
+wheel===0.33.4
+wrapt===1.12.1
 yaql===1.1.3
+zipp===3.1.0