From af9ecfe03b611f9f3974545cd084e9d087f95192 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Fri, 28 Jun 2019 15:47:58 -0700 Subject: [PATCH] Update tox.ini for new upper constraints strategy The requirements team has defined a new strategy for handling upper constraints[1]. This patch applies those strategies to Octavia. [1] http://lists.openstack.org/pipermail/openstack-discuss/ \ 2019-May/006478.html Change-Id: Idc380dc010e6c8a0e4b1c1ab545f73f457ea7022 --- doc/requirements.txt | 6 ++++-- lower-constraints.txt | 2 +- requirements.txt | 2 +- test-requirements.txt | 3 ++- tox.ini | 11 ++++++----- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 2e3e732cb9..13925f587c 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -9,7 +9,8 @@ sphinxcontrib-blockdiag>=1.5.4 # BSD sphinxcontrib-nwdiag>=0.9.5 # BSD sphinxcontrib-seqdiag>=0.8.4 # BSD docutils>=0.11 # OSI-Approved Open Source, Public Domain -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD graphviz!=0.5.0,>=0.4 # MIT License openstackdocstheme>=1.18.1 # Apache-2.0 sadisplay>=0.4.8 # BSD @@ -18,4 +19,5 @@ reno>=2.5.0 # Apache-2.0 # This needs to be installed after above modules pydotplus>=2.0.2 # MIT License pyparsing>=2.1.0 # MIT -networkx>=1.10 # BSD +networkx>=1.10,<2.3;python_version<'3.0' # BSD +networkx>=1.10;python_version>='3.4' # BSD diff --git a/lower-constraints.txt b/lower-constraints.txt index 4f1604454d..3e76b3b59f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -83,7 +83,7 @@ oslo.context==2.19.2 oslo.db==4.27.0 oslo.i18n==3.15.3 oslo.log==3.36.0 -oslo.messaging==5.29.0 +oslo.messaging==6.3.0 oslo.middleware==3.31.0 oslo.policy==1.30.0 oslo.reports==1.18.0 diff --git a/requirements.txt b/requirements.txt index a067bd05e5..1f9afe6159 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ oslo.context>=2.19.2 # Apache-2.0 oslo.db>=4.27.0 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 -oslo.messaging>=5.29.0 # Apache-2.0 +oslo.messaging>=6.3.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index e28d2d92a2..2bedb05bfa 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,4 +18,5 @@ doc8>=0.6.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0 # Required for pep8 - doc8 tests -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD diff --git a/tox.ini b/tox.ini index c970776287..652ac297a2 100644 --- a/tox.ini +++ b/tox.ini @@ -8,9 +8,10 @@ usedevelop = True setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning install_command = - pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} {opts} {packages} + pip install {opts} {packages} whitelist_externals = find -deps = -r{toxinidir}/requirements.txt +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run '{posargs}' @@ -21,7 +22,7 @@ basepython = python3 # This environment is called from CI scripts to test and publish # the API Ref to developer.openstack.org. deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt whitelist_externals = rm @@ -90,7 +91,7 @@ whitelist_externals = [testenv:docs] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt whitelist_externals = rm @@ -160,7 +161,7 @@ max-line-length = 79 [testenv:releasenotes] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt whitelist_externals = rm