Skip to content

Commit bf2beb9

Browse files
committed
Stop configuring install_command in tox and stop use pip.
Currently, we are overriding 'install_command' to use 'pip'. This is considered poor behavior and 'python -m pip' should be used instead: https://snarky.ca/why-you-should-use-python-m-pip/ It turns out that this is the the default value provided by tox: https://tox.readthedocs.io/en/latest/config.html#conf-install_command So we can remove the line and simply use the default value. Use the right way when it's necessary. Change-Id: I410173d5fdcd8c592d98eed2f48b98e06299e8b3
1 parent 045f133 commit bf2beb9

3 files changed

Lines changed: 17 additions & 18 deletions

File tree

lower-constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jmespath==0.9.0
3838
jsonpatch==1.16
3939
jsonpointer==1.13
4040
jsonschema==2.6.0
41-
keystoneauth1==3.6.2
41+
keystoneauth1==3.14.0
4242
kombu==4.0.0
4343
linecache2==1.0.0
4444
MarkupSafe==1.0

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ six>=1.10.0 # MIT
66

77
Babel!=2.4.0,>=2.3.4 # BSD
88
cliff!=2.9.0,>=2.8.0 # Apache-2.0
9-
keystoneauth1>=3.6.2 # Apache-2.0
9+
keystoneauth1>=3.14.0 # Apache-2.0
1010
openstacksdk>=0.17.0 # Apache-2.0
1111
osc-lib>=2.0.0 # Apache-2.0
1212
oslo.i18n>=3.15.3 # Apache-2.0

tox.ini

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
minversion = 3.1
2+
minversion = 3.2.0
33
envlist = py37,pep8
44
skipdist = True
55
# Automatic envs (pyXX) will only use the python version appropriate to that
@@ -10,9 +10,7 @@ ignore_basepython_conflict = True
1010
[testenv]
1111
usedevelop = True
1212
basepython = python3
13-
install_command = pip install {opts} {packages}
14-
setenv = VIRTUAL_ENV={envdir}
15-
OS_STDOUT_CAPTURE=1
13+
setenv = OS_STDOUT_CAPTURE=1
1614
OS_STDERR_CAPTURE=1
1715
OS_TEST_TIMEOUT=60
1816
deps =
@@ -24,6 +22,7 @@ whitelist_externals = stestr
2422

2523
[testenv:fast8]
2624
# Use same environment directory as pep8 env to save space and install time
25+
setenv = VIRTUAL_ENV={envdir}
2726
envdir = {toxworkdir}/pep8
2827
commands =
2928
{toxinidir}/tools/fast8.sh
@@ -62,12 +61,12 @@ commands =
6261

6362
[testenv:unit-tips]
6463
commands =
65-
pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
66-
pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
67-
pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
68-
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
69-
pip install -q -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
70-
pip freeze
64+
python -m pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
65+
python -m pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
66+
python -m pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
67+
python -m pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
68+
pythom -m pip install -q -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
69+
python -m pip freeze
7170
stestr run {posargs}
7271
whitelist_externals = stestr
7372

@@ -81,12 +80,12 @@ commands =
8180
setenv = OS_TEST_PATH=./openstackclient/tests/functional
8281
passenv = OS_*
8382
commands =
84-
pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
85-
pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
86-
pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
87-
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
88-
pip install -q -U -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
89-
pip freeze
83+
python -m pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
84+
python -m pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
85+
python -m pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
86+
python -m pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
87+
python -m pip install -q -U -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
88+
python -m pip freeze
9089
stestr run {posargs}
9190

9291
[testenv:venv]

0 commit comments

Comments
 (0)