Fix oslo-cookiecutter-tox-cookiecutter job

* Update supported python versions
* Adopt to recent tox version
* Remove the sections for translation from setup.cfg
* Remove lower-constraints job
* Bump hacking
* Remove note about the behavior of old pip

Co-Authored-By: Hervé Beraud <hberaud@redhat.com>
Change-Id: Iefe0051368fdf9406bdb853fb88d7ed2a78064b8
This commit is contained in:
Takashi Kajinami
2024-09-23 23:07:02 +09:00
parent 4552af7774
commit 326dc3a64e
8 changed files with 17 additions and 48 deletions

View File

@@ -1,7 +1,3 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx>=2.0 # BSD
openstackdocstheme>=1.20.0
sphinxcontrib-apidoc>=0.2.0 # BSD

View File

@@ -1,8 +0,0 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking==2.0.0
mypy==0.720
oslotest==1.5.1
reno==2.5.0

View File

@@ -1,3 +1,3 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# Requirements lower bounds listed here are our best effort to keep them up to
# date but we do not test them so no guarantee of having them all correct. If
# you find any incorrect lower bounds, let us know or propose a fix.

View File

@@ -6,7 +6,7 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = http://launchpad.net/oslo
python-requires = >=3.6
python-requires = >=3.8
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -15,8 +15,10 @@ classifier =
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
@@ -25,20 +27,6 @@ classifier =
packages =
oslo_{{ cookiecutter.module_name }}
[compile_catalog]
directory = oslo.{{cookiecutter.module_name}}/locale
domain = oslo.{{cookiecutter.module_name}}
[update_catalog]
domain = oslo.{{cookiecutter.module_name}}
output_dir = oslo.{{cookiecutter.module_name}}/locale
input_file = oslo.{{cookiecutter.module_name}}/locale/oslo.{{cookiecutter.module_name}}.pot
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = oslo.{{cookiecutter.module_name}}/locale/oslo.{{cookiecutter.module_name}}.pot
[mypy]
show_column_numbers = true
show_error_context = true

View File

@@ -1,8 +1,4 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=3.0,<3.1.0 # Apache-2.0
hacking>=7.0.0,<7.1.0 # Apache-2.0
mypy>=0.720 # MIT
oslotest>=1.5.1
stestr>=2.0.0 # Apache-2.0

View File

@@ -1,6 +1,6 @@
[tox]
minversion = 3.1.0
envlist = py36,pep8
minversion = 3.18.0
envlist = py39,pep8
ignore_basepython_conflict = True
skipsdist = True
@@ -12,11 +12,6 @@ deps =
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:lower-constraints]
deps = -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:pep8]
commands = flake8 {posargs}
@@ -35,7 +30,7 @@ commands =
coverage xml -o cover/coverage.xml
[testenv:docs]
whitelist_externals =
allowlist_externals =
rm
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -45,7 +40,7 @@ commands =
sphinx-build -W --keep-going -b html doc/source doc/build/html {posargs}
[testenv:releasenotes]
whitelist_externals = rm
allowlist_externals = rm
deps = {[testenv:docs]deps}
commands =
rm -rf releasenotes/build

View File

@@ -30,4 +30,4 @@ def test_api():
pass
EOF
tox -e pep8,py36,docs,lower-constraints,cover,releasenotes
tox -e pep8,py39,docs,cover,releasenotes

View File

@@ -1,5 +1,5 @@
[tox]
minversion = 3.2.0
minversion = 3.18.0
envlist = cookiecutter
skipsdist = True
ignore_basepython_conflict = True
@@ -7,5 +7,7 @@ ignore_basepython_conflict = True
[testenv:cookiecutter]
basepython = python3
deps = cookiecutter
allowlist_externals =
{toxinidir}/tools/test_tox_targets.sh
commands =
{toxinidir}/tools/test_tox_targets.sh