Update u-c file

Also, this change removes redundant ignore-warnings rules

Change-Id: I286645fd5ddb155e5c8a4ede6429ddf5076cfc2b
This commit is contained in:
Andrey Kurilin 2024-01-18 13:11:51 +01:00
parent 45e63dc56f
commit 7ad868bb9b
8 changed files with 95 additions and 103 deletions

View File

@ -17,6 +17,15 @@ Changelog
.. Release notes for existing releases are MUTABLE! If there is something that
was missed or can be improved, feel free to change it!
unreleased
----------
Fixed
~~~~~
* Correct `python_requires` version to indicate correct minimum supported
python version
[4.0.0] - 2024-01-10
--------------------

View File

@ -16,7 +16,6 @@
# oslo_config. As a first step, let's hardcode the interface of it
from oslo_config import cfg
from oslo_config import fixture # noqa
CONF = cfg.CONF

View File

@ -7,7 +7,7 @@ author = OpenStack
author_email = openstack-discuss@lists.openstack.org
home_page = https://rally.readthedocs.io/
license = Apache License, Version 2.0
requires_python = >=3.6
requires_python = >=3.8
classifier =
Environment :: OpenStack
Intended Audience :: Developers

View File

@ -4,11 +4,12 @@
hacking>=3.0 # Apache Software License
fixtures # Apache Software License/BSD License
pytest # MIT
# py.test plugin for measuring coverage.
pytest-cov # MIT
# py.test plugin for generating HTML reports
pytest-html # Mozilla Public License 2.0 (MPL 2.0)
pytest-html # MIT
# py.test xdist plugin for distributed testing and loop-on-failing modes
pytest-xdist # MIT
@ -17,5 +18,5 @@ testtools # MIT
testresources # UNKNOWN
docutils<0.18 # public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)
docutils # public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)
Pygments # BSD-2-Clause

View File

@ -6,6 +6,8 @@
package:
state: absent
name: python3-pyyaml
when:
- ansible_distribution == "CentOS"
- name: Install python3.8-dev (Ubuntu 20.04)
become: true
@ -19,7 +21,34 @@
package:
state: present
name: python3.10-dev
when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "22.04"
when:
- ansible_distribution == "Ubuntu"
- ansible_distribution_version == "22.04"
- name: Install python3.8-devel (Centos 8)
become: true
package:
state: present
name: python38-devel
when:
- ansible_distribution == "CentOS"
- ansible_distribution_version | int < 9
- name: Change default python3 to be python3.8 (Centos 8)
become: true
shell: |
set -x
set -e
echo "alias python3='python3.8'" >> ~/.bashrc"
echo "alias python3='python3.8'" >> ~zuul/.bashrc"
whereis python3.8
ls /usr/bin/python*
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 100
update-alternatives --set python3 /usr/bin/python3.8
when:
- ansible_distribution == "CentOS"
- ansible_distribution_version | int < 9
- name: Install pip3 if needed
become: true
@ -28,15 +57,9 @@
chdir: '{{ zuul.project.src_dir }}'
cmd: |
set -e
python_version=`python3 --version`
python_version=`echo $python_version |awk '{print $2}'`
python_version=`python3 --version | awk '{print $2}'`
echo $python_version
if [[ $python_version =~ ^3.6 ]]; then
pip_url=https://bootstrap.pypa.io/pip/3.6/get-pip.py
else
pip_url=https://bootstrap.pypa.io/get-pip.py
fi
curl $pip_url -o /tmp/get-pip.py
curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
python3 /tmp/get-pip.py
- name: Install bindep

View File

@ -19,9 +19,9 @@ import os
from unittest import mock
import uuid
from oslo_config import fixture as cfg_fixture # noqa N311
import testtools
from rally.common import cfg
from rally.common import db
from rally import plugins
@ -37,7 +37,7 @@ class TempHomeDir(TempDir):
self.useFixture(fixtures.EnvironmentVariable("HOME", self.path))
class DatabaseFixture(cfg.fixture.Config):
class DatabaseFixture(cfg_fixture.Config):
"""Create clean DB before starting test."""
def setUp(self):
super(DatabaseFixture, self).setUp()

19
tox.ini
View File

@ -38,12 +38,6 @@ passenv =
commands = flake8
distribute = false
[testenv:py38]
basepython = python3.8
[testenv:py39]
basepython = python3.9
[testenv:samples]
commands =
find . -type f -name "*.pyc" -delete
@ -145,24 +139,15 @@ filterwarnings =
error
# Introduced with oslo.db-12.1.0
ignore:.*Support for the MySQL NDB Cluster storage engine has been deprecated and will be removed in a future release.:DeprecationWarning:
# Introuduced with SQLAlchemy-1.4.46, can be removed when rally supports SQLAlchemy>=2.0.0
# Introduced with SQLAlchemy-1.4.46, can be removed when rally supports SQLAlchemy>=2.0.0
ignore:.*Set environment variable SQLALCHEMY_SILENCE_UBER_WARNING=1 to silence this message.*
# instead of ignoring all modules, let's list only libraries that are failing
ignore:invalid escape sequence:DeprecationWarning:.*netaddr.*
ignore:invalid escape sequence:DeprecationWarning:.*prettytable
ignore:invalid escape sequence:DeprecationWarning:.*subunit.*
ignore:invalid escape sequence:DeprecationWarning:.*docutils.*
# we do not use anything inner from OptionParser, so we do not care about it's parent
ignore:The frontend.OptionParser class will be replaced by a subclass of argparse.ArgumentParser in Docutils 0.21 or later.:DeprecationWarning:
# we do not use Option directly, it is initialized by OptionParser by itself.
# as soon as docutils team get rid of frontend.Option, they will also fix OptionParser
ignore: The frontend.Option class will be removed in Docutils 0.21 or later.:DeprecationWarning:
# python 3.7
ignore:Using or importing the ABCs:DeprecationWarning:unittest2.*
# python 3.8
ignore:::.*netaddr.strategy.*
# python 3.10
ignore:The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives:DeprecationWarning:
ignore:pkg_resources is deprecated as an API:DeprecationWarning:
# pytest-cov
# pytest-cov & pytest-xdist
ignore:The --rsyncdir command line argument and rsyncdirs config variable are deprecated.:DeprecationWarning:

View File

@ -1,84 +1,59 @@
alembic===1.6.5;python_version < '3.7'
alembic===1.9.4;python_version >= '3.7'
attrs===21.2.0;python_version < '3.7'
attrs===23.1.0;python_version >= '3.7'
alembic===1.9.4
attrs===23.1.0
bcrypt===4.0.1
certifi===2023.5.7
certifi===2023.11.17
cffi===1.15.1
charset-normalizer===3.1.0
cryptography===3.4.7;python_version < '3.7'
cryptography===40.0.2;python_version >= '3.7'
charset-normalizer===3.2.0
cryptography===41.0.4
debtcollector===2.5.0
distlib===0.3.6
extras===1.0.0
filelock===3.0.12;python_version < '3.7'
filelock===3.12.0;python_version >= '3.7'
fixtures===4.0.1
idna===2.10;python_version < '3.7'
idna===3.4;python_version >= '3.7'
iso8601===1.1.0
Jinja2===3.0.1;python_version < '3.7'
Jinja2===3.1.2;python_version >= '3.7'
jsonschema===3.2.0;python_version < '3.7'
jsonschema===4.17.3;python_version >= '3.7'
Mako===1.1.4;python_version < '3.7'
Mako===1.2.4;python_version >= '3.7'
MarkupSafe===2.0.1;python_version < '3.7'
MarkupSafe===2.1.2;python_version >= '3.7'
msgpack===1.0.5
netaddr===0.8.0
distlib===0.3.7
filelock===3.12.4
idna===3.4
iso8601===2.0.0
Jinja2===3.1.2
jsonschema===4.19.1
jsonschema-specifications===2023.7.1
Mako===1.2.4
MarkupSafe===2.1.3
msgpack===1.0.6
netaddr===0.9.0
netifaces===0.11.0
oslo.config===8.7.0;python_version < '3.8'
oslo.context===3.3.0;python_version < '3.8'
oslo.db===9.0.0;python_version < '3.8'
oslo.i18n===5.0.1;python_version < '3.8'
oslo.log===4.5.0;python_version < '3.8'
oslo.serialization===4.1.0;python_version < '3.8'
oslo.utils===4.9.0;python_version < '3.8'
oslo.config===9.1.1;python_version >= '3.8'
oslo.context===5.1.1;python_version >= '3.8'
oslo.db===12.3.1;python_version >= '3.8'
oslo.i18n===6.0.0;python_version >= '3.8'
oslo.log===5.2.0;python_version >= '3.8'
oslo.serialization===5.1.1;python_version >= '3.8'
oslo.utils===6.1.0;python_version >= '3.8'
packaging===20.9;python_version < '3.7'
packaging===23.1;python_version >= '3.7'
paramiko===2.7.2;python_version < '3.7'
paramiko===3.1.0;python_version >= '3.7'
pbr===5.11.1
pip===23.0.1
platformdirs===3.2.0
prettytable===0.7.2;python_version < '3.7'
prettytable===3.7.0;python_version >= '3.7'
oslo.config===9.3.0
oslo.context===5.3.0
oslo.db===14.1.0
oslo.i18n===6.2.0
oslo.log===5.4.0
oslo.serialization===5.3.0
oslo.utils===7.0.0
packaging===23.1
paramiko===3.3.1
pbr===6.0.0
pip===23.3.2
platformdirs===3.10.0
prettytable===3.9.0
pycparser===2.21
PyNaCl===1.5.0
pyOpenSSL===20.0.1;python_version < '3.7'
pyOpenSSL===23.1.1;python_version >= '3.7'
pyparsing===3.0.9
pyrsistent===0.17.3;python_version < '3.7'
pyrsistent===0.19.3;python_version >= '3.7'
pyOpenSSL===23.2.0
pyparsing===3.1.1
python-dateutil===2.8.2
python-subunit===1.4.2
pytz===2023.3
PyYAML===6.0
requests===2.25.1;python_version < '3.7'
requests===2.28.2;python_version >= '3.7'
rfc3986===1.5.0;python_version < '3.7'
rfc3986===2.0.0;python_version >= '3.7'
setuptools===57.0.0;python_version < '3.7'
setuptools===67.6.1;python_version >= '3.7'
python-subunit===1.4.3
pytz===2023.3.post1
PyYAML===6.0.1
referencing===0.30.2
requests===2.31.0
rfc3986===2.0.0
rpds-py===0.10.3
setuptools===69.0.3
six===1.16.0
SQLAlchemy===1.4.41
stevedore===3.3.0;python_version < '3.8'
stevedore===5.0.0;python_version >= '3.8'
stevedore===5.1.0
testresources===2.0.1
testscenarios===0.5.0
testtools===2.6.0
typing-extensions===4.5.0
urllib3===1.26.15
virtualenv===20.4.7;python_version < '3.7'
virtualenv===20.22.0;python_version >= '3.7'
testtools===2.7.0
typing-extensions===4.9.0
tzdata===2023.3
urllib3===1.26.16
virtualenv===20.24.5
wcwidth===0.2.6
wheel===0.40.0
wheel===0.42.0
wrapt===1.15.0