Browse Source

Update upper-constraints consumption

In order to deal with horizon going into the upper-constraints file so
that horizon plugins can consume it normally, we need to align the
constraints invocation in horizon's tox.ini. This means putting the -C
argument into the dependencies list rather than the pip install line so
that it doesn't get appended to tox installing horizon itself.

While we're in here, move nosehtmloutput into test-requirements so that
we don't need to do .[test] which also doesn't work with constraints.

Needed-By: https://review.openstack.org/550475
Change-Id: I736f79010c2d34e25d41d967a38128c2263ed13f
tags/14.0.0.0b1
Monty Taylor 1 year ago
parent
commit
835a4bb7ba
No account linked to committer's email address
3 changed files with 5 additions and 7 deletions
  1. 0
    4
      setup.cfg
  2. 1
    0
      test-requirements.txt
  3. 4
    3
      tox.ini

+ 0
- 4
setup.cfg View File

@@ -22,10 +22,6 @@ classifier =
22 22
     Programming Language :: Python :: 3.5
23 23
     Topic :: Internet :: WWW/HTTP
24 24
 
25
-[extras]
26
-test =
27
-  nosehtmloutput>=0.0.3 # Apache-2.0
28
-
29 25
 [global]
30 26
 setup-hooks =
31 27
     openstack_dashboard.hooks.setup_hook

+ 1
- 0
test-requirements.txt View File

@@ -19,6 +19,7 @@ nodeenv>=0.9.4 # BSD
19 19
 nose>=1.3.7 # LGPL
20 20
 nose-exclude>=0.3.0 # LGPL
21 21
 nosexcover>=1.0.10 # BSD
22
+nosehtmloutput>=0.0.3 # Apache-2.0
22 23
 openstack.nose-plugin>=0.7 # Apache-2.0
23 24
 openstackdocstheme>=1.18.1 # Apache-2.0
24 25
 reno>=2.5.0 # Apache-2.0

+ 4
- 3
tox.ini View File

@@ -4,7 +4,7 @@ minversion = 2.3.2
4 4
 skipsdist = True
5 5
 
6 6
 [testenv]
7
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
7
+install_command = pip install {opts} {packages}
8 8
 usedevelop = True
9 9
 setenv =
10 10
   VIRTUAL_ENV={envdir}
@@ -14,9 +14,10 @@ setenv =
14 14
 whitelist_externals =
15 15
   bash
16 16
   find
17
-deps = .[test]
18
-  -r{toxinidir}/requirements.txt
17
+deps =
18
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
19 19
   -r{toxinidir}/test-requirements.txt
20
+  -r{toxinidir}/requirements.txt
20 21
 commands =
21 22
   horizon: {envpython} {toxinidir}/manage.py test --settings=horizon.test.settings {posargs}
22 23
   py27: {[unit_tests]commands}

Loading…
Cancel
Save