Merge "Turn off legacy resolver workaround in pip"
This commit is contained in:
commit
6d87998e36
|
@ -0,0 +1,4 @@
|
||||||
|
libvirt-dev [platform:dpkg]
|
||||||
|
libvirt-devel [platform:redhat]
|
||||||
|
pkg-config [platform:dpkg]
|
||||||
|
pkgconfig [platform:redhat]
|
|
@ -1 +1,14 @@
|
||||||
# Nothing
|
eventlet
|
||||||
|
keyring
|
||||||
|
keystoneauth1
|
||||||
|
pkgconfig
|
||||||
|
libvirt-python
|
||||||
|
oslo.concurrency
|
||||||
|
oslo.config
|
||||||
|
oslo.i18n
|
||||||
|
oslo.log
|
||||||
|
oslo.messaging
|
||||||
|
oslo.service
|
||||||
|
python-daemon
|
||||||
|
python-novaclient
|
||||||
|
retrying
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
# hacking pulls in flake8
|
# hacking pulls in flake8
|
||||||
hacking
|
hacking>=1.1.0,<=2.0.0 # Apache-2.0
|
||||||
bashate >= 0.2
|
bashate >= 0.2
|
||||||
pylint<2.5.0
|
isort<5;python_version>="3.0"
|
||||||
|
pylint<2.1.0;python_version<"3.0" # GPLv2
|
||||||
|
pylint<2.3.0;python_version>="3.0" # GPLv2
|
||||||
|
|
||||||
|
|
22
tox.ini
22
tox.ini
|
@ -1,16 +1,14 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = linters
|
envlist = linters,pylint
|
||||||
minversion = 2.3
|
minversion = 2.3
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
sitepackages=False
|
|
||||||
|
|
||||||
stxdir = {toxinidir}/..
|
stxdir = {toxinidir}/..
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
install_command = pip install --use-deprecated legacy-resolver\
|
sitepackages = False
|
||||||
-v -v -v \
|
basepython = python3
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
|
install_command = pip install -v -v -v -U {opts} {packages}
|
||||||
-U {opts} {packages}
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
|
@ -81,21 +79,11 @@ commands =
|
||||||
flake8
|
flake8
|
||||||
|
|
||||||
[testenv:pylint]
|
[testenv:pylint]
|
||||||
basepython = python3
|
|
||||||
sitepackages = False
|
|
||||||
deps =
|
deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
-e{[tox]stxdir}/config/tsconfig/tsconfig
|
|
||||||
-e{[tox]stxdir}/config/sysinv/sysinv/sysinv
|
-e{[tox]stxdir}/config/sysinv/sysinv/sysinv
|
||||||
|
-e{[tox]stxdir}/config/tsconfig/tsconfig
|
||||||
-e{[tox]stxdir}/fault/fm-api
|
-e{[tox]stxdir}/fault/fm-api
|
||||||
keyring
|
|
||||||
keystoneauth1
|
|
||||||
libvirt-python
|
|
||||||
oslo.messaging
|
|
||||||
oslo.service
|
|
||||||
pyinotify
|
|
||||||
python-daemon
|
|
||||||
python-novaclient
|
|
||||||
|
|
||||||
commands = pylint {posargs} \
|
commands = pylint {posargs} \
|
||||||
ceph/ceph-manager/ceph-manager/ceph_manager \
|
ceph/ceph-manager/ceph-manager/ceph_manager \
|
||||||
|
|
Loading…
Reference in New Issue