openstack
/
murano-dashboard
Code Issues Proposed changes

Fix lower-constraints tox env 

Previously install_command specifies upper-constraints
so lower-constraints actually did not work.
upper-constraints must be specified via 'deps' instead of 'install_command'.

The fix reveals that django-formtools 1.0 is not compatible with
Django 1.11 or later. django-formtools 2.0 seems the minimum requirement.

Castellan 0.16.0 is not compatible with murano-dashboard because there is
barbican_endpoint_type. The minimum required version is 0.18.0.

This commit also drops Django dependency in requirements.txt.
After commit 7e91070789187d9e6b5ac2b57ca755504e058e32 in
openstack/requirements repo, all project requirements.txt must
have lower bounds and Django entry hits this.
Horizon declares django dependencies, so there is no need to
declare django dependencies in murano-dashboard explicitly.

Change-Id: I3048ca5570523494f5a58a15449902f8cb3eb3a4
This commit is contained in:
Akihiro Motoki 2018-06-12 11:41:13 +09:00
parent 5fd0cbf5a2
commit 6285103ef0
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lower-constraints.txt
View File

@ -3,7 +3,7 @@ appdirs==1.4.3
asn1crypto==0.24.0
Babel==2.3.4
beautifulsoup4==4.6.0
castellan==0.16.0
castellan==0.18.0
certifi==2018.1.18
cffi==1.11.5
chardet==3.0.4
@ -20,7 +20,7 @@ Django==1.11
django-appconf==1.0.2
django-babel==0.6.2
django-compressor==2.0
django-formtools==1.0
django-formtools==2.0
django-nose==1.4.4
django-pyscss==2.0.2
docutils==0.14

6
requirements.txt
View File

@ -4,16 +4,14 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
beautifulsoup4>=4.6.0 # MIT
Django<2;python_version<'3.0' # BSD
Django<2.1;python_version>='3.0' # BSD
django-formtools>=1.0 # BSD
django-formtools>=2.0 # BSD
iso8601>=0.1.11 # MIT
six>=1.10.0 # MIT
python-muranoclient>=0.8.2 # Apache-2.0
pytz>=2013.6 # MIT
PyYAML>=3.12 # MIT
yaql>=1.1.3 # Apache 2.0 License
castellan>=0.16.0 # Apache-2.0
castellan>=0.18.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
semantic-version>=2.3.1 # BSD

5
tox.ini
View File

@ -5,7 +5,6 @@ skipsdist = True
[testenv]
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
@ -14,10 +13,10 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_SHOW_ELAPSED=1
DJANGO_SETTINGS_MODULE=muranodashboard.tests.settings
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
deps = -r{toxinidir}/requirements.txt
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
http://tarballs.openstack.org/heat-dashboard/heat-dashboard-master.tar.gz
commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings
[testenv:pep8]