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] pypa/setuptools#3197 Change-Id: Iae24917add1aae6b1ed46dba0d2c270b39c5698c
openstack · Jan 2, 2023 · 39b6553 · 39b6553
1 parent 5c0eab3
commit 39b6553
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -17,4 +17,5 @@
 
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
+    py_modules=[],
     pbr=True)
diff --git a/tox.ini b/tox.ini
@@ -44,6 +44,7 @@ deps =
     pycodestyle>=2.0.0,<3.0.0 # MIT
     doc8>=0.8.1 # Apache-2.0
 allowlist_externals = bash
+                      {toxinidir}/tools/run_bashate.sh
 commands =
   flake8 {posargs:ironic_python_agent examples}
   # Run bashate during pep8 runs to ensure violations are caught by

diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
@@ -21,7 +21,6 @@
       devstack_localrc:
         IRONIC_BUILD_DEPLOY_RAMDISK: True
         IRONIC_VM_COUNT: 2
-        IRONIC_VM_SPECS_RAM: 2750
         # This matches the default in ironic-base, specifying for clarity
         IRONIC_RAMDISK_TYPE: dib
       devstack_services: