From cf4db8e7893eb3cc1b7c58efd3dc6bd1e211d4dd Mon Sep 17 00:00:00 2001 From: Charles Short Date: Sat, 12 May 2018 09:26:57 -0400 Subject: [PATCH] Require the (soon-to-be) Rocky version of Horizon ... or at least the first published tarball which will lead to Rocky. On the other side this means forcing the usage of mox as long as there are tests that depends on it (the switch was already flipped in Horizon, so it needs to be enabled here). This allows us to depend on newer Horizon features, including changes to the test suite that are useful for the mox removal effort. Also fixes lower-constants.txt Change-Id: I3908c6d212b9d1df7e4490128b6a0a3f751e8276 Signed-off-by: Charles Short --- lower-constraints.txt | 44 +++++++++++++++++++++---------------------- requirements.txt | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 293b02d..c7be7b0 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,7 +1,7 @@ alabaster==0.7.10 appdirs==1.4.3 asn1crypto==0.24.0 -Babel==2.5.3 +Babel==2.3.4 certifi==2018.1.18 cffi==1.11.5 chardet==3.0.4 @@ -9,17 +9,17 @@ cliff==2.11.0 cmd2==0.8.1 colorama==0.3.9 contextlib2==0.5.5 -coverage==4.5.1 +coverage==4.0 cryptography==2.1.4 debtcollector==1.19.0 decorator==4.2.1 deprecation==2.0 -Django==1.11.11 django-appconf==1.0.2 django-babel==0.6.2 django-compressor==2.2 -django-nose==1.4.5 +django-nose==1.4.4 django-pyscss==2.0.2 +Django==1.11 docutils==0.14 dogpile.cache==0.6.5 dulwich==0.19.0 @@ -29,7 +29,7 @@ fixtures==3.0.0 flake8==2.5.5 futurist==1.6.0 hacking==0.12.0 -horizon==13.0.0 +horizon==14.0.0.0b1 idna==2.6 imagesize==1.0.0 iso8601==0.1.12 @@ -44,18 +44,18 @@ MarkupSafe==1.0 mccabe==0.2.1 mock==2.0.0 monotonic==1.4 -mox3==0.25.0 +mox3==0.20.0 msgpack==0.5.6 munch==2.2.0 netaddr==0.7.19 netifaces==0.10.6 -nodeenv==1.2.0 +nodeenv==0.9.4 +nose-exclude==0.3.0 nose==1.3.7 -nose-exclude==0.5.0 -nosehtmloutput==0.0.5 -nosexcover==1.0.11 -openstack.nose-plugin==0.11 -openstackdocstheme==1.20.0 +nosehtmloutput==0.0.3 +nosexcover==1.0.10 +openstack.nose-plugin==0.7 +openstackdocstheme==1.18.1 openstacksdk==0.12.0 os-client-config==1.29.0 os-service-types==1.2.0 @@ -70,7 +70,7 @@ oslo.serialization==2.25.0 oslo.utils==3.36.0 osprofiler==2.0.0 packaging==17.1 -pbr==3.1.1 +pbr==2.0.0 pep8==1.5.7 Pint==0.8.1 prettytable==0.7.2 @@ -91,38 +91,37 @@ python-mimeparse==1.6.0 python-neutronclient==6.7.0 python-novaclient==10.1.0 python-swiftclient==3.5.0 -python-zaqarclient==1.9.0 +python-zaqarclient==1.0.0 pytz==2018.3 PyYAML==3.12 rcssmin==1.0.6 -reno==2.7.0 +reno==2.5.0 requests==2.18.4 requestsexceptions==1.4.0 rfc3986==1.1.0 rjsmin==1.0.12 -selenium==3.11.0 +selenium==2.50.1 semantic-version==2.6.0 simplejson==3.13.2 six==1.11.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 +Sphinx==1.6.2 sphinxcontrib-websupport==1.0.1 stevedore==1.28.0 termcolor==1.1.0 -testtools==2.3.0 +testtools==2.2.0 traceback2==1.4.0 unittest2==1.1.0 urllib3==1.22 warlock==1.3.0 WebOb==1.7.4 wrapt==1.10.11 -XStatic==1.0.1 -XStatic-Angular==1.5.8.0 XStatic-Angular-Bootstrap==2.2.0.0 XStatic-Angular-FileUpload==12.0.4.0 XStatic-Angular-Gettext==2.3.8.0 XStatic-Angular-lrdragndrop==1.0.2.2 XStatic-Angular-Schema-Form==0.8.13.0 +XStatic-Angular==1.5.8.0 XStatic-Bootstrap-Datepicker==1.3.1.0 XStatic-Bootstrap-SCSS==3.3.7.1 XStatic-bootswatch==3.3.7.0 @@ -130,11 +129,11 @@ XStatic-D3==3.5.17.0 XStatic-Font-Awesome==4.7.0.0 XStatic-Hogan==2.0.0.2 XStatic-Jasmine==2.4.1.1 -XStatic-jQuery==1.10.2.1 XStatic-JQuery-Migrate==1.2.1.1 XStatic-jquery-ui==1.12.0.1 XStatic-JQuery.quicksearch==2.0.3.1 XStatic-JQuery.TableSorter==2.14.5.1 +XStatic-jQuery==1.10.2.1 XStatic-JSEncrypt==2.3.1.1 XStatic-mdi==1.4.57.0 XStatic-objectpath==1.2.1.0 @@ -144,4 +143,5 @@ XStatic-smart-table==1.4.13.2 XStatic-Spin==1.2.5.2 XStatic-term.js==0.0.7.0 XStatic-tv4==1.2.7.0 -xvfbwrapper==0.2.9 +XStatic==1.0.1 +xvfbwrapper==0.1.3 diff --git a/requirements.txt b/requirements.txt index 0f2f02a..3721272 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,4 @@ python-zaqarclient>=1.0.0 # Apache-2.0 Babel!=2.4.0,>=2.3.4 # BSD Django<2.0,>=1.11 # BSD django-babel>=0.6.2 # BSD -horizon>=13.0.0 # Apache-2.0 +horizon>=14.0.0.0b1 # Apache-2.0