Fix for tox4 and setuptools
- Disable auto discovery in setuptools This is to avoid issues with latest setuptools after version 61.0 For more info see [1] - add bash script to allowlist in tox.ini - use default size for vm memory [1] https://github.com/pypa/setuptools/issues/3197 Change-Id: Iae24917add1aae6b1ed46dba0d2c270b39c5698c
This commit is contained in:
parent
5c0eab351c
commit
39b6553161
1
setup.py
1
setup.py
@ -17,4 +17,5 @@ import setuptools
|
|||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['pbr>=2.0.0'],
|
setup_requires=['pbr>=2.0.0'],
|
||||||
|
py_modules=[],
|
||||||
pbr=True)
|
pbr=True)
|
||||||
|
1
tox.ini
1
tox.ini
@ -44,6 +44,7 @@ deps =
|
|||||||
pycodestyle>=2.0.0,<3.0.0 # MIT
|
pycodestyle>=2.0.0,<3.0.0 # MIT
|
||||||
doc8>=0.8.1 # Apache-2.0
|
doc8>=0.8.1 # Apache-2.0
|
||||||
allowlist_externals = bash
|
allowlist_externals = bash
|
||||||
|
{toxinidir}/tools/run_bashate.sh
|
||||||
commands =
|
commands =
|
||||||
flake8 {posargs:ironic_python_agent examples}
|
flake8 {posargs:ironic_python_agent examples}
|
||||||
# Run bashate during pep8 runs to ensure violations are caught by
|
# Run bashate during pep8 runs to ensure violations are caught by
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
IRONIC_BUILD_DEPLOY_RAMDISK: True
|
IRONIC_BUILD_DEPLOY_RAMDISK: True
|
||||||
IRONIC_VM_COUNT: 2
|
IRONIC_VM_COUNT: 2
|
||||||
IRONIC_VM_SPECS_RAM: 2750
|
|
||||||
# This matches the default in ironic-base, specifying for clarity
|
# This matches the default in ironic-base, specifying for clarity
|
||||||
IRONIC_RAMDISK_TYPE: dib
|
IRONIC_RAMDISK_TYPE: dib
|
||||||
devstack_services:
|
devstack_services:
|
||||||
|
Loading…
Reference in New Issue
Block a user