From 35db4c21e68a77c68510ed59aa71a8d9238bac39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= Date: Thu, 23 Mar 2023 16:54:26 +0100 Subject: [PATCH] Remove virtualenv pinning virtualenv pinning was added on Yoga final release time because some of the deliverables' packaging didn't work with the new python module discovery (see details: [1]). 1 year passed, hopefully most of the projects have fixed these errors, so let's unpin virtualenv. Since newest virtualenv introduces some errors, those need to be fixed: - skipdist=False needs to be removed otherwise openstack_releases won't be installed - basepython=python3 is not necessary anymore since there is no py2 - allowlist_external is needed for tools/* scripts This patch also adds python3.10 classifier to setup.cfg [1] https://review.opendev.org/835423 Change-Id: Ibc1f538ddd04c0afeb3d5464fe0b1347ee3ea67a --- setup.cfg | 1 + tox.ini | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3eb39a1436..29dbb8452f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,6 +16,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 [files] packages = openstack_releases diff --git a/tox.ini b/tox.ini index 48d2372e1f..419248c8c4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,6 @@ [tox] minversion = 3.2.0 envlist = py3,validate,pep8,bashate,docs -skipsdist = True -ignore_basepython_conflict=true -# note(elod.illes): setuptools capping / pinning does not work as it is -# pinned inside virtualenv. So to cap / pin setuptools we need to do it -# via virtualenv. Virtualenv 20.13.3 is the last version that holds -# setuptools < 61.0.0 -requires = virtualenv==20.13.3 [testenv] usedevelop=True @@ -24,7 +17,8 @@ setenv = OS_STDERR_CAPTURE=1 OS_DEBUG=1 OS_LOG_CAPTURE=1 -basepython = python3 +allowlist_externals = + {toxinidir}/tools/* deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt