From 9527c16a65c514d9cc63c51b252a382e6e890446 Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Fri, 17 Aug 2018 14:24:56 +0300 Subject: [PATCH] Update requirements * update upper-constraints * update test and main requirements Change-Id: Iba247fdc5566ff6073e0ec3dd7b0070a0dd36196 --- requirements.txt | 57 ++++---- test-requirements.txt | 16 +-- tests/ci/sync_requirements.py | 26 ++-- upper-constraints.txt | 256 ++++++++++++++++++++-------------- 4 files changed, 201 insertions(+), 154 deletions(-) diff --git a/requirements.txt b/requirements.txt index 27fb99c2..b9f11bb8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,34 +2,33 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -rally>=0.11.0 +rally>=0.11.0 # Apache License, Version 2.0 -# OpenStack related -boto>=2.32.1 # MIT -gnocchiclient>=3.3.1 # Apache Software License -keystoneauth1>=3.3.0 # Apache Software License +boto # MIT +gnocchiclient # Apache Software License +keystoneauth1 # Apache Software License os-faults>=0.1.15 # Apache Software License -osprofiler>=1.4.0 # 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 # 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 -requests>=2.14.2 # Apache License, Version 2.0 -kubernetes>1.0.0 # Apache License Version 2.0 +osprofiler # 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 # 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 +requests # Apache License, Version 2.0 +kubernetes # Apache License Version 2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 36f122ac..3e068100 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,12 +12,12 @@ pytest-html>=1.10.0 # Mozilla Public License # py.test xdist plugin for distributed testing and loop-on-failing modes pytest-xdist # MIT -coverage>=4.0,!=4.4 # Apache License, Version 2.0 -ddt>=1.0.1 # UNKNOWN -mock>=2.0.0 # UNKNOWN -python-dateutil>=2.4.2 # Simplified BSD -testtools>=2.2.0 # UNKNOWN +coverage!=4.4 # Apache License, Version 2.0 +ddt # MIT +mock # UNKNOWN +python-dateutil # Dual License +testtools # UNKNOWN -sphinx>=1.6.2,!=1.6.6 # BSD -oslosphinx>=4.7.0 # Apache Software License -oslotest>=3.2.0 # Apache Software License +sphinx!=1.6.6,!=1.6.7 # BSD +oslosphinx # Apache Software License +oslotest # Apache Software License diff --git a/tests/ci/sync_requirements.py b/tests/ci/sync_requirements.py index d6887d05..f89aaa47 100644 --- a/tests/ci/sync_requirements.py +++ b/tests/ci/sync_requirements.py @@ -24,6 +24,7 @@ import re import sys import textwrap +import pkg_resources import requests @@ -254,6 +255,10 @@ class UpperConstraint(PYPIPackage): def update(self, version): self._version = version + def fetch_version(self): + self._version = None + return self.version + def parse_data(raw_data, include_comments=True, dependency_cls=Requirement): # first elem is None to simplify checks of last elem in requirements @@ -353,26 +358,21 @@ def update_upper_constraints(): global_uc = parse_data(raw_g_uc, include_comments=False, dependency_cls=UpperConstraint) - with open("upper-constraints.txt") as f: - our_uc = parse_data(f.read(), - dependency_cls=UpperConstraint) - with open("requirements.txt") as f: - our_requirements = parse_data(f.read(), include_comments=False) - for name, req in our_requirements.items(): - if isinstance(req, Comment): - continue - if name not in our_uc: - our_uc[name] = UpperConstraint(name) + our_uc = [UpperConstraint(package_name=p.project_name, version=p.version) + for p in pkg_resources.working_set + # do not include the current package at u-c + if p.project_name != "rally-openstack"] - if name in global_uc: + for package in our_uc: + if package.package_name in global_uc: # we cannot use whatever we want versions in CI. OpenStack CI # ignores versions listed in requirements of # particular project and use versions from global u-c file. # It means that we need to suggest to use the same versions - our_uc[name].update(global_uc[name].version) + package.update(global_uc[package.package_name].version) - our_uc = sorted(our_uc.values(), key=lambda o: o.package_name.upper()) + our_uc = sorted(our_uc, key=lambda o: o.package_name.upper()) _write_requirements("upper-constraints.txt", our_uc) diff --git a/upper-constraints.txt b/upper-constraints.txt index 7d11fa0c..bc47489f 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -1,145 +1,193 @@ +alabaster===0.7.11 alembic===0.9.7 -boto===2.48.0 -decorator===4.2.1 -gnocchiclient===7.0.1 -Jinja2===2.10 -jsonschema===2.6.0 -keystoneauth1===3.4.0 -kubernetes===4.0.0 -morph===0.1.2 -netaddr===0.7.19 -os-faults===0.1.17 -oslo.config===5.2.0 -oslo.db===4.33.0 -oslo.log===3.36.0 -oslo.utils===3.35.0 -osprofiler===1.15.1 -paramiko===2.4.0 -pbr===3.1.1 -PrettyTable===0.7.1 -pyOpenSSL===17.5.0 -python-ceilometerclient===2.9.0 -python-cinderclient===3.5.0 -python-designateclient===2.9.0 -python-glanceclient===2.9.1 -python-heatclient===1.14.0 -python-ironicclient===2.2.0 -python-keystoneclient===3.15.0 -python-magnumclient===2.8.0 -python-manilaclient===1.21.0 -python-mistralclient===3.2.0 -python-monascaclient===1.10.0 -python-muranoclient===1.0.1 -python-neutronclient===6.7.0 -python-novaclient===9.1.1 -python-saharaclient===1.5.0 -python-senlinclient===1.7.0 -python-subunit===1.2.0 -python-swiftclient===3.5.0 -python-troveclient===2.14.0 -python-watcherclient===1.6.0 -python-zaqarclient===1.9.0 -PyYAML===3.12 -requests===2.18.4 -six===1.11.0 -SQLAlchemy===1.2.1 -virtualenv===15.1.0 - -# testing - -pytest===3.3.0 -pytest-cov===2.5.1 -pytest-forked===0.2 -pytest-html===1.16.0 -pytest-metadata===1.5.1 -pytest-xdist===1.20.1 - -# not direct dependencies - -ansible===2.4.3.0 +ansible===2.6.2 +apipkg===1.5 appdirs===1.4.3 +argparse===1.2.1 asn1crypto===0.24.0 -Babel===2.5.3 +atomicwrites===1.1.5 +attrs===18.1.0 +Babel===2.6.0 +backports.shutil-get-terminal-size===1.0.0 bcrypt===3.1.4 -certifi===2018.1.18 -cffi===1.11.4 +boto===2.49.0 +cachetools===2.1.0 +certifi===2018.4.16 +cffi===1.11.5 chardet===3.0.4 click===6.7 -cliff===2.11.0 -cmd2===0.8.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.1.4 -debtcollector===1.19.0 -deprecation===1.1 -dogpile.cache===0.6.4 +coverage===4.5.1 +cryptography===2.3 +ddt===1.2.0 +debtcollector===1.20.0 +decorator===4.3.0 +deprecation===2.0.5 +docutils===0.14 +dogpile.cache===0.6.6 enum34===1.1.6 +execnet===1.5.0 extras===1.0.0 fasteners===0.14.1 fixtures===3.0.0 -prettytable===0.7 +flake8===2.6.2 funcsigs===1.0.2 functools32===3.2.3.post2 +future===0.16.0 futures===3.2.0 -futurist===1.6.0 -httplib2===0.10.3 -idna===2.6 -ipaddress===1.0.19 +futurist===1.7.0 +gnocchiclient===7.0.2 +google-auth===1.5.0 +hacking===1.1.0 +idna===2.7 +imagesize===1.0.0 +ipaddress===1.0.22 +ipython===5.8.0 +ipython-genutils===0.2.0 iso8601===0.1.12 +Jinja2===2.10 jmespath===0.9.3 -jsonpatch===1.21 +jsonpatch===1.23 jsonpointer===2.0 +jsonschema===2.6.0 +keystoneauth1===3.10.0 +kubernetes===7.0.0 linecache2===1.0.0 Mako===1.0.7 MarkupSafe===1.0 -monotonic===1.4 -msgpack===0.5.4 -munch===2.2.0 +mccabe===0.5.3 +mock===2.0.0 +monotonic===1.5 +more-itertools===4.2.0 +morph===0.1.3 +mox3===0.26.0 +msgpack===0.5.6 +munch===2.3.2 murano-pkg-check===0.3.0 -netifaces===0.10.6 -oauth2client===4.1.2 -openstacksdk===0.11.3 -os-client-config===1.29.0 -os-service-types===1.1.0 -osc-lib===1.9.0 -oslo.concurrency===3.25.0 -oslo.context===2.20.0 -oslo.i18n===3.19.0 -oslo.serialization===2.24.0 -packaging===16.8 -ply===3.10 -positional===1.2.1 -pyasn1===0.4.2 -pyasn1-modules===0.2.1 +netaddr===0.7.19 +netifaces===0.10.7 +oauthlib===2.1.0 +openstacksdk===0.17.2 +os-client-config===1.31.2 +os-faults===0.1.17 +os-service-types===1.3.0 +osc-lib===1.11.1 +oslo.concurrency===3.27.0 +oslo.config===6.4.0 +oslo.context===2.21.0 +oslo.db===4.40.0 +oslo.i18n===3.21.0 +oslo.log===3.39.0 +oslo.serialization===2.27.0 +oslo.utils===3.36.4 +oslosphinx===4.18.0 +oslotest===3.6.0 +osprofiler===2.3.0 +packaging===17.1 +paramiko===2.4.1 +pathlib2===2.3.2 +pbr===4.2.0 +pexpect===4.6.0 +pickleshare===0.7.4 +pip===18.0 +pluggy===0.6.0 +ply===3.11 +prettytable===0.7.2 +prompt-toolkit===1.0.15 +ptyprocess===0.6.0 +py===1.5.4 +pyasn1===0.4.3 +pyasn1-modules===0.2.2 +pycodestyle===2.0.0 pycparser===2.18 -pycrypto===2.6.1 -pyghmi===1.0.38 +pyflakes===1.2.3 +pyghmi===1.1.0 +Pygments===2.2.0 pyinotify===0.9.6 PyNaCl===1.2.1 +pyOpenSSL===18.0.0 pyparsing===2.2.0 -pyperclip===1.6.0 -python-dateutil===2.6.1 +pyperclip===1.6.4 +pytest===3.6.3 +pytest-cov===2.5.1 +pytest-forked===0.2 +pytest-html===1.19.0 +pytest-metadata===1.7.0 +pytest-xdist===1.22.5 +Python===2.7.15rc1 +python-ceilometerclient===2.9.0 +python-cinderclient===4.0.1 +python-dateutil===2.7.3 +python-designateclient===2.10.0 python-editor===1.0.3 +python-glanceclient===2.12.1 +python-heatclient===1.16.1 +python-ironicclient===2.5.0 +python-keystoneclient===3.17.0 +python-magnumclient===2.10.0 +python-manilaclient===1.24.1 python-mimeparse===1.6.0 -python-openstackclient===3.14.0 -pytz===2018.3 +python-mistralclient===3.7.0 +python-monascaclient===1.12.1 +python-muranoclient===1.1.1 +python-neutronclient===6.9.0 +python-novaclient===11.0.0 +python-octaviaclient===1.6.0 +python-openstackclient===3.16.0 +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.10.0 +pytz===2018.5 +PyYAML===3.13 +rally===1.1.0 +requests===2.19.1 +requests-oauthlib===1.0.0 requestsexceptions===1.4.0 rfc3986===1.1.0 rsa===3.4.2 +scandir===1.7 semantic-version===2.6.0 -simplejson===3.13.2 +setuptools===40.0.0 +simplegeneric===0.8.1 +simplejson===3.16.0 +six===1.11.0 +snowballstemmer===1.2.1 +Sphinx===1.7.6 +sphinxcontrib-websupport===1.1.0 +SQLAlchemy===1.2.10 sqlalchemy-migrate===0.11.0 sqlparse===0.2.4 -stevedore===1.28.0 -subprocess32===3.2.7 +stestr===2.1.0 +stevedore===1.29.0 +subprocess32===3.5.2 Tempita===0.5.2 +testresources===2.0.1 +testscenarios===0.5.0 testtools===2.3.0 traceback2===1.4.0 +traitlets===4.3.2 +typing===3.6.4 ujson===1.35 unicodecsv===0.14.1 unittest2===1.1.0 -urllib3===1.22 -warlock===1.2.0 -WebOb===1.7.4 -websocket-client===0.40.0 +urllib3===1.23 +virtualenv===16.0.0 +voluptuous===0.11.1 +warlock===1.3.0 +wcwidth===0.1.7 +WebOb===1.8.2 +websocket-client===0.48.0 +wheel===0.31.1 wrapt===1.10.11 +wsgiref===0.1.2 yaql===1.1.3