From 0423c180fdd08ded6ab85950c19d1d2b6345798c Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Tue, 29 Jun 2021 17:19:36 -0400 Subject: [PATCH] Open cinderlib for xena development cinderlib is a 'trailing' deliverable type. The stable/wallaby branch has just been cut, so transition master to xena development. Depends-on: https://review.opendev.org/c/openstack/releases/+/797422 Change-Id: Ic6be0596fcc4cef40301702c3bac3085468c8daa --- requirements.txt | 6 ++---- tox.ini | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4b007a5..3dfad8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,4 @@ -# restrict cinder to the wallaby series only -cinder>=18.0.0,<19.0.0 # Apache-2.0 -# specify brick wallaby (upper bound controlled by openstack upper-constraints) -os-brick>=4.3.1 +cinder>=18.0.0 # Apache-2.0 +os-brick>=4.4.0 importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0 diff --git a/tox.ini b/tox.ini index 61f9670..96d980c 100644 --- a/tox.ini +++ b/tox.ini @@ -24,8 +24,8 @@ install_command = python -m pip install {env:PIP_OPTIONS:} {opts} {packages} # NOTE: Functional tests may fail if host is missing bindeps from deps projects deps = -r{toxinidir}/test-requirements.txt - git+https://opendev.org/openstack/os-brick@stable/wallaby#egg=os-brick - git+https://opendev.org/openstack/cinder@stable/wallaby#egg=cinder + git+https://opendev.org/openstack/os-brick#egg=os-brick + git+https://opendev.org/openstack/cinder#egg=cinder commands = find . -ignore_readdir_race -type f -name "*.pyc" -delete @@ -87,13 +87,13 @@ allowlist_externals = {[testenv:functional]allowlist_externals} # Not reusing doc's env due to https://github.com/tox-dev/tox/issues/477 # envdir = {toxworkdir}/docs deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = doc8 --ignore D001 --ignore-path .tox --ignore-path *.egg-info --ignore-path doc/build --ignore-path .eggs/*/EGG-INFO/*.txt -e txt -e rst