diff --git a/lower-constraints.txt b/lower-constraints.txt index 7742ce8d..88b5ca6c 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -17,7 +17,7 @@ django-appconf==1.0.2 django-babel==0.6.2 django-compressor==2.2 django-pyscss==2.0.2 -Django==1.11.11 +Django==2.2 docutils==0.14 dogpile.cache==0.6.5 dulwich==0.19.0 @@ -27,6 +27,7 @@ fixtures==3.0.0 flake8==2.5.5 futurist==1.6.0 hacking==0.12.0 +horizon==17.1.0 idna==2.6 imagesize==1.0.0 iso8601==0.1.12 diff --git a/requirements.txt b/requirements.txt index 70d9764e..427eb983 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 python-ironicclient!=2.5.2,!=2.7.1,>=2.3.0 # Apache-2.0 +horizon>=17.1.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index bf39b00f..7cb47f44 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,9 +11,6 @@ testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT -# Include horizon as test requirement -http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon - # integration tests requirements selenium>=2.50.1 # Apache-2.0 xvfbwrapper>=0.1.3 #license: MIT diff --git a/tox.ini b/tox.ini index f17ccab2..0e1f2df7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.8 skipsdist = True -envlist = py3,py3-{dj111,dj22},pep8 +envlist = py3,pep8 [testenv] usedevelop = True @@ -17,8 +17,6 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = - dj111: pip install django>=1.11,<2 - dj22: pip install django>=2.2,<2.3 {toxinidir}/manage.py test ironic_ui --settings=ironic_ui.test.settings --exclude-tag integration [testenv:integration]