summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lower-constraints.txt4
-rw-r--r--requirements.txt6
-rw-r--r--tox.ini5
3 files changed, 6 insertions, 9 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 3c0990e..2edfbf6 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -3,7 +3,7 @@ appdirs==1.4.3
3asn1crypto==0.24.0 3asn1crypto==0.24.0
4Babel==2.3.4 4Babel==2.3.4
5beautifulsoup4==4.6.0 5beautifulsoup4==4.6.0
6castellan==0.16.0 6castellan==0.18.0
7certifi==2018.1.18 7certifi==2018.1.18
8cffi==1.11.5 8cffi==1.11.5
9chardet==3.0.4 9chardet==3.0.4
@@ -20,7 +20,7 @@ Django==1.11
20django-appconf==1.0.2 20django-appconf==1.0.2
21django-babel==0.6.2 21django-babel==0.6.2
22django-compressor==2.0 22django-compressor==2.0
23django-formtools==1.0 23django-formtools==2.0
24django-nose==1.4.4 24django-nose==1.4.4
25django-pyscss==2.0.2 25django-pyscss==2.0.2
26docutils==0.14 26docutils==0.14
diff --git a/requirements.txt b/requirements.txt
index fc18c96..1d8a29e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,16 +4,14 @@
4pbr!=2.1.0,>=2.0.0 # Apache-2.0 4pbr!=2.1.0,>=2.0.0 # Apache-2.0
5 5
6beautifulsoup4>=4.6.0 # MIT 6beautifulsoup4>=4.6.0 # MIT
7Django<2;python_version<'3.0' # BSD 7django-formtools>=2.0 # BSD
8Django<2.1;python_version>='3.0' # BSD
9django-formtools>=1.0 # BSD
10iso8601>=0.1.11 # MIT 8iso8601>=0.1.11 # MIT
11six>=1.10.0 # MIT 9six>=1.10.0 # MIT
12python-muranoclient>=0.8.2 # Apache-2.0 10python-muranoclient>=0.8.2 # Apache-2.0
13pytz>=2013.6 # MIT 11pytz>=2013.6 # MIT
14PyYAML>=3.12 # MIT 12PyYAML>=3.12 # MIT
15yaql>=1.1.3 # Apache 2.0 License 13yaql>=1.1.3 # Apache 2.0 License
16castellan>=0.16.0 # Apache-2.0 14castellan>=0.18.0 # Apache-2.0
17 15
18oslo.log>=3.36.0 # Apache-2.0 16oslo.log>=3.36.0 # Apache-2.0
19semantic-version>=2.3.1 # BSD 17semantic-version>=2.3.1 # BSD
diff --git a/tox.ini b/tox.ini
index 97a66d3..7089319 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,6 @@ skipsdist = True
5 5
6[testenv] 6[testenv]
7usedevelop = True 7usedevelop = True
8install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
9setenv = VIRTUAL_ENV={envdir} 8setenv = VIRTUAL_ENV={envdir}
10 NOSE_WITH_OPENSTACK=1 9 NOSE_WITH_OPENSTACK=1
11 NOSE_OPENSTACK_COLOR=1 10 NOSE_OPENSTACK_COLOR=1
@@ -14,10 +13,10 @@ setenv = VIRTUAL_ENV={envdir}
14 NOSE_OPENSTACK_SHOW_ELAPSED=1 13 NOSE_OPENSTACK_SHOW_ELAPSED=1
15 DJANGO_SETTINGS_MODULE=muranodashboard.tests.settings 14 DJANGO_SETTINGS_MODULE=muranodashboard.tests.settings
16passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY 15passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
17deps = -r{toxinidir}/requirements.txt 16deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
17 -r{toxinidir}/requirements.txt
18 -r{toxinidir}/test-requirements.txt 18 -r{toxinidir}/test-requirements.txt
19 http://tarballs.openstack.org/heat-dashboard/heat-dashboard-master.tar.gz 19 http://tarballs.openstack.org/heat-dashboard/heat-dashboard-master.tar.gz
20
21commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings 20commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings
22 21
23[testenv:pep8] 22[testenv:pep8]