From 76c6d3deb39045eec4bf11d189892485e8a9c454 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 14 Dec 2022 19:23:34 +0100 Subject: [PATCH] Update to py38 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit py38 is the oldest py version support vs Ubuntu 22.04 python third-party. It updates requirements to yoga too. Signed-off-by: Cédric Ollivier Change-Id: I9d39f3600a4d0c432b7caf2f0b2bd51554e12318 --- requirements.txt | 34 +++++++++++++++++----------------- setup.py | 28 +++++----------------------- test-requirements.txt | 21 +++++++++++---------- tox.ini | 28 +++++++++++++++++----------- 4 files changed, 50 insertions(+), 61 deletions(-) diff --git a/requirements.txt b/requirements.txt index a333380..717ba07 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,27 +2,27 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=3.1.1 +pbr!=2.1.0 # Apache-2.0 attrdict>=2.0.0 bitmath>=1.3.1.1 -paramiko>=1.14.0 -prettytable>=0.7.2 -pytz>=2016.4 -six==1.15.0 -python-glanceclient==3.2.2 -python-neutronclient>=7.3.0 -python-novaclient>=17.3.0 -python-openstackclient>=5.4.0 -python-keystoneclient>=4.2.0 -pyyaml>=3.11 -pyzmq>=15.3.0 -requests>=2.13.0 -tabulate>=0.7.5 -flask>=0.12 +paramiko # LGPLv2.1+ +PrettyTable # BSD +pytz # MIT +six # MIT +python-glanceclient # Apache-2.0 +python-neutronclient # Apache-2.0 +python-novaclient # Apache-2.0 +python-openstackclient # Apache-2.0 +python-keystoneclient!=2.1.0 # Apache-2.0 +PyYAML # MIT +pyzmq # LGPL+BSD +requests!=2.20.0,!=2.24.0 # Apache-2.0 +tabulate # MIT +Flask!=0.11 # BSD fluent-logger>=0.5.3 -netaddr>=0.7.19 +netaddr # BSD xtesting>=0.92.0 hdrhistogram>=0.8.0 behave>=1.2.6 -retry>=0.9.2 \ No newline at end of file +retry>=0.9.2 diff --git a/setup.py b/setup.py index bf772f3..f63cc23 100644 --- a/setup.py +++ b/setup.py @@ -13,27 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from setuptools.command.test import test -from setuptools import setup -import sys +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT +import setuptools - -class Tox(test): - def initialize_options(self): - test.initialize_options(self) - self.tox_args = None - - def finalize_options(self): - test.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import tox - sys.exit(tox.cmdline()) - - -if __name__ == '__main__': - setup(setup_requires=['pbr'], pbr=True, - tests_require=['tox'], - cmdclass={'test': Tox}) +setuptools.setup( + setup_requires=['pbr>=2.0.0'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index b2f61ac..da52c9d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,17 +4,18 @@ hacking -coverage>=3.6 +coverage!=4.4 # Apache-2.0 discover flake8>=3.3.0 -python-subunit>=0.0.18 +python-subunit # Apache-2.0/BSD scapy>=2.3.1 -sphinx>=1.4.0 -sphinx_rtd_theme>=0.2.4 -oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 -pytest>=3.2.2 +sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0,!=3.4.2 # BSD +sphinx-rtd-theme # MIT +oslosphinx # Apache-2.0 +oslotest<4;python_version<'3.6' # Apache-2.0 +oslotest;python_version>='3.6' # Apache-2.0 +testrepository # Apache-2.0/BSD +testscenarios # Apache-2.0/BSD +testtools # MIT +pytest # MIT pylint==2.10.2 diff --git a/tox.ini b/tox.ini index 926e603..00f262c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py36,pep8,lint,docs,docs-linkcheck +envlist = py38,pep8,lint,docs,docs-linkcheck skipsdist = True [testenv] @@ -9,24 +9,26 @@ usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = + -chttps://opendev.org/openstack/requirements/raw/branch/stable/yoga/upper-constraints.txt + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = py.test -q --basetemp={envtmpdir} {posargs} [testenv:pep8] -basepython = python3 +basepython = python3.8 commands = flake8 {toxinidir} [testenv:lint] -basepython = python3 +basepython = python3.8 commands = pylint --rcfile pylint.rc nfvbench test [testenv:venv] -basepython = python3 +basepython = python3.8 commands = {posargs} [testenv:cover] -basepython = python3 +basepython = python3.8 commands = python setup.py testr --coverage --testr-args='{posargs}' [flake8] @@ -69,15 +71,19 @@ builtins = _ exclude=venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,dib-venv [testenv:docs] -basepython = python3 -deps = -rdocs/requirements.txt +basepython = python3.8 +deps = + -chttps://opendev.org/openstack/requirements/raw/branch/stable/yoga/upper-constraints.txt + -rdocs/requirements.txt commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html echo "Generated docs available in {toxinidir}/docs/_build/html" whitelist_externals = echo [testenv:docs-linkcheck] -basepython = python3 -deps = -rdocs/requirements.txt +basepython = python3.8 +deps = + -chttps://opendev.org/openstack/requirements/raw/branch/stable/yoga/upper-constraints.txt + -rdocs/requirements.txt passenv = http_proxy https_proxy no_proxy commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck -- 2.16.6