From 165783992c3b102c34217da84a1082016f826991 Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Tue, 11 Oct 2016 15:52:42 +0300 Subject: [PATCH] Sync requirements before release Change-Id: If3c066c364b18f5bc13ab03715a5f08b5e7d078b --- requirements.txt | 86 ++++++++++++++++++----------------- test-requirements.txt | 24 +++++----- tests/ci/sync_requirements.py | 2 +- 3 files changed, 57 insertions(+), 55 deletions(-) diff --git a/requirements.txt b/requirements.txt index e218db1a..e3cc4704 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,50 +3,52 @@ # process, which may cause wedges in the gate later. # Rally core dependencies -alembic>=0.8.4 # MIT -decorator>=3.4.0 # new BSD License -Jinja2>=2.8 # BSD +alembic>=0.8.4,<=0.8.8 # MIT +decorator>=3.4.0,<=4.0.10 # new BSD License +Jinja2==2.8 # BSD jsonschema>=2.0.0,!=2.5.0,<3.0.0 # MIT -netaddr>=0.7.12,!=0.7.16 # BSD -oslo.config>=3.14.0 # Apache Software License -oslo.db>=4.10.0 # Apache Software License -oslo.i18n>=2.1.0 # Apache Software License -oslo.log>=1.14.0 # Apache Software License -oslo.serialization>=1.10.0 # Apache Software License -oslo.utils>=3.16.0 # Apache Software License -paramiko>=2.0 # LGPL -pbr>=1.6 # Apache Software License -PrettyTable>=0.7,<0.8 # BSD -PyYAML>=3.1.0 # MIT -python-subunit>=0.0.18 -requests>=2.10.0 # Apache License, Version 2.0 +netaddr>=0.7.13,!=0.7.16,<=0.7.18 # BSD +oslo.config>=3.14.0,<=3.17.0 # Apache Software License +oslo.db>=4.10.0,!=4.13.1,!=4.13.2,<=4.13.3 # Apache Software License +oslo.i18n>=2.1.0,<=3.9.0 # Apache Software License +oslo.log>=3.11.0,<=3.16.0 # Apache Software License +oslo.serialization>=1.10.0,<=2.13.0 # Apache Software License +oslo.utils==3.16.0 # Apache Software License +paramiko>=2.0,<=2.0.2 # LGPL +pbr>=1.6,<=1.10.0 # Apache Software License +PrettyTable>=0.7.1,<0.8 # BSD +PyYAML>=3.10.0,<=3.12 # MIT +python-subunit>=0.0.18,<=1.2.0 +requests>=2.10.0,<=2.11.1 # Apache License, Version 2.0 SQLAlchemy>=1.0.10,<1.1.0 # MIT -sphinx>=1.2.1,!=1.3b1,<1.3 # BSD -six>=1.9.0 # MIT +sphinx>=1.2.1,!=1.3b1,<1.4 # BSD +six>=1.9.0,<=1.10.0 # MIT # OpenStack related -boto>=2.32.1 # MIT -gnocchiclient>=2.2.0 # Apache Software License -keystoneauth1>=2.10.0 # Apache Software License -python-ceilometerclient>=2.5.0 # Apache Software License -python-cinderclient>=1.6.0,!=1.7.0,!=1.7.1 # Apache Software License +boto>=2.32.1,<=2.42.0 # MIT +gnocchiclient>=2.2.0,<=2.6.0 # Apache Software License +keystoneauth1>=2.10.0,<=2.13.0 # Apache Software License +python-ceilometerclient>=2.5.0,<=2.6.1 # Apache Software License +python-cinderclient>=1.6.0,!=1.7.0,!=1.7.1,<=1.9.0 # Apache Software License python-cueclient>=1.0.0 # Apache License, Version 2.0 -python-designateclient>=1.5.0 # Apache License, Version 2.0 -python-glanceclient>=2.3.0,!=2.4.0 # Apache License, Version 2.0 -python-heatclient>=1.4.0 # Apache Software License -python-ironicclient>=1.6.0 # Apache Software License -python-keystoneclient>=2.0.0,!=2.1.0 # Apache Software License -python-magnumclient>=2.0.0 # Apache Software License -python-manilaclient>=1.10.0 # Apache Software License -python-mistralclient>=2.0.0 -python-monascaclient>=1.1.0 # Apache Software License -python-muranoclient>=0.8.2 # Apache License, Version 2.0 -python-neutronclient>=5.1.0 # Apache Software License -python-novaclient>=2.29.0,!=2.33.0 # Apache License, Version 2.0 -python-saharaclient>=0.18.0 # Apache License, Version 2.0 -python-senlinclient>=0.3.0 # Apache Software License -python-swiftclient>=2.2.0 # Apache Software License -python-troveclient>=2.2.0 # Apache Software License -python-watcherclient>=0.23.0 # Apache Software License -python-zaqarclient>=1.0.0 # Apache Software License -pycparser==2.13 # BSD # Version pinned to avoid AssertionError: sorry, but this version only supports 100 named groups +python-designateclient>=1.5.0,<=2.3.0 # Apache License, Version 2.0 +python-glanceclient==2.5.0 # Apache License, Version 2.0 +python-heatclient==1.5.0 # Apache Software License +python-ironicclient>=1.6.0,<=1.7.0 # Apache Software License +python-keystoneclient>=2.0.0,!=2.1.0,<=3.6.0 # Apache Software License +python-magnumclient>=2.0.0,<=2.3.0 # Apache Software License +python-manilaclient>=1.10.0,<=1.11.0 # Apache Software License +python-mistralclient>=2.0.0,<=2.1.1 +python-monascaclient>=1.1.0,<=1.2.0 # Apache Software License +python-muranoclient>=0.8.2,<=0.11.1 # Apache License, Version 2.0 +python-neutronclient>=5.1.0,<=6.0.0 # Apache Software License +python-novaclient>=2.29.0,!=2.33.0,<=6.0.0 # Apache License, Version 2.0 +python-saharaclient==0.18.0 # Apache License, Version 2.0 +python-senlinclient>=0.3.0,<=1.0.0 # Apache Software License +python-swiftclient>=2.2.0,<=3.1.0 # Apache Software License +python-troveclient>=2.2.0,<=2.5.0 # Apache Software License +python-watcherclient>=0.23.0,<=0.25.0 # Apache Software License +python-zaqarclient>=1.0.0,<=1.2.0 # Apache Software License +# [do-not-touch] Version pinned to avoid AssertionError: sorry, but this version +# only supports 100 named groups +pycparser!=2.14 # BSD diff --git a/test-requirements.txt b/test-requirements.txt index ee514a4a..e129a565 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,21 +5,21 @@ # [do-not-touch] we need to modify our code to support latest release hacking>=0.9.2,<0.10 # Apache Software License -pytest>=2.7 # MIT +pytest>=2.7,<=3.0.3 # MIT # py.test plugin for measuring coverage. -pytest-cov>=2.2.1 # MIT +pytest-cov>=2.2.1,<=2.4.0 # MIT # py.test plugin for generating HTML reports -pytest-html>=1.10.0 # Mozilla Public License 2.0 (MPL 2.0) +pytest-html>=1.10.0,<=1.10.1 # Mozilla Public License 2.0 (MPL 2.0) # py.test xdist plugin for distributed testing and loop-on-failing modes -pytest-xdist # MIT +pytest-xdist<=1.15.0 # MIT # py.test plugin to abort hanging tests -pytest-timeout # MIT +pytest-timeout<=1.0.0 # MIT -coverage>=3.6 # Apache License, Version 2.0 -ddt>=1.0.1 -mock>=2.0 -python-dateutil>=2.4.2 # Simplified BSD -testtools>=1.4.0 +coverage>=3.6,<=4.2 # Apache License, Version 2.0 +ddt>=1.0.1,<=1.1.1 +mock>=2.0,<=2.0.0 +python-dateutil>=2.4.2,<=2.5.3 # Simplified BSD +testtools>=1.4.0,<=2.2.0 -oslosphinx>=2.5.0,!=3.4.0 # Apache Software License -oslotest>=1.10.0 # Apache Software License +oslosphinx==4.7.0 # Apache Software License +oslotest>=1.10.0,<=2.10.0 # Apache Software License diff --git a/tests/ci/sync_requirements.py b/tests/ci/sync_requirements.py index 52d2d3c2..f02f8b76 100644 --- a/tests/ci/sync_requirements.py +++ b/tests/ci/sync_requirements.py @@ -84,7 +84,7 @@ class Requirement(object): self.do_not_touch = False def sync_max_version_with_pypy(self): - if isinstance(self.version, dict) and not self.upper_limit_flag: + if isinstance(self.version, dict) and not self.do_not_touch: self.version["max"] = "<=%s" % self.pypy_info["info"]["version"] @property