From d20434cf3a72f7d0a88a5bd76b547a3a11077b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Wed, 4 Nov 2020 10:50:51 +0100 Subject: [PATCH 1/7] Use TOX_CONSTRAINTS_FILE UPPER_CONSTRAINTS_FILE is old name and deprecated This allows to use upper-constraints file as more readable way instead of UPPER_CONSTRAINTS_FILE=. [1] https://review.opendev.org/#/c/722814/ [2] https://zuul-ci.org/docs/zuul-jobs/python-roles.html#rolevar-tox.tox_constraints_file Change-Id: If7d6b78ce39b9d629095ed461f0cb154ed6ed9bf --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 0973c33..fc568d6 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ ignore_basepython_conflict = true [testenv] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = stestr run --slowest {posargs} @@ -26,7 +26,7 @@ commands = python setup.py test --coverage --coverage-package-name=oslo_serializ [testenv:docs] whitelist_externals = rm deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = rm -fr doc/build -- GitLab From 967a36fdbed5fc68e307fefc385ab2b8509a91e2 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 1 Feb 2021 11:05:36 +0000 Subject: [PATCH 2/7] Drop use of deprecated collections classes These were moved in Python 3.3 and the aliases will be removed in 3.10. Change-Id: If31797f8fc758468d153c364700db47452edf3dd Signed-off-by: Stephen Finucane --- oslo_serialization/tests/test_jsonutils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/oslo_serialization/tests/test_jsonutils.py b/oslo_serialization/tests/test_jsonutils.py index f076822..9c92235 100644 --- a/oslo_serialization/tests/test_jsonutils.py +++ b/oslo_serialization/tests/test_jsonutils.py @@ -14,6 +14,7 @@ # under the License. import collections +import collections.abc import datetime import functools import io @@ -241,9 +242,9 @@ class ToPrimitiveTestCase(test_base.BaseTestCase): self.assertEqual({'iteritems': 'iteritems'}, p) def test_mapping(self): - # Make sure collections.Mapping is converted to a dict + # Make sure collections.abc.Mapping is converted to a dict # and not a list. - class MappingClass(collections.Mapping): + class MappingClass(collections.abc.Mapping): def __init__(self): self.data = dict(a=1, b=2, c=3) -- GitLab From a1f90ab1dce1d3b016c1a95bc57cf7ec7da57ab7 Mon Sep 17 00:00:00 2001 From: "wu.shiming" Date: Fri, 19 Feb 2021 15:04:33 +0800 Subject: [PATCH 3/7] Remove lower-constraints remnants These were missed in change: Ie53b809ab031525958b58730a12cb37d0bdf5c82 Change-Id: I2c9051126b4a42706bdce025b07706e4689a09ae --- lower-constraints.txt | 35 ----------------------------------- tox.ini | 6 ------ 2 files changed, 41 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 107c82e..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,35 +0,0 @@ -appdirs==1.3.0 -Babel==2.3.4 -bandit==1.4.0 -coverage==4.0 -debtcollector==1.2.0 -extras==1.0.0 -fixtures==3.0.0 -gitdb==0.6.4 -GitPython==1.0.1 -ipaddress===1.0.17 -iso8601==0.1.11 -keystoneauth1==3.4.0 -linecache2==1.0.0 -mox3==0.20.0 -msgpack==0.5.2 -netaddr==0.7.18 -netifaces==0.10.4 -os-client-config==1.28.0 -oslo.i18n==3.15.3 -oslo.utils==3.33.0 -oslotest==3.2.0 -pbr==2.0.0 -pyparsing==2.1.0 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -requests==2.14.2 -requestsexceptions==1.2.0 -smmap==0.9.0 -stestr==2.0.0 -stevedore==1.20.0 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -wrapt==1.7.0 diff --git a/tox.ini b/tox.ini index 929b8dc..7b0f443 100644 --- a/tox.ini +++ b/tox.ini @@ -39,12 +39,6 @@ commands = rm -rf releasenotes/build sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt - [flake8] # E123, E125 skipped as they are invalid PEP-8. # W504 line break after binary operator -- GitLab From 2b41ddc5f2a156bb9c1a1a9454207e01e778528c Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Thu, 18 Mar 2021 11:25:47 +0000 Subject: [PATCH 4/7] Update master for stable/wallaby Add file to the reno documentation build to show release notes for stable/wallaby. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/wallaby. Sem-Ver: feature Change-Id: I4d751a40d903b0a9be9b5518b13bfc293100ff94 --- releasenotes/source/index.rst | 1 + releasenotes/source/wallaby.rst | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/source/wallaby.rst diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 8e1b9fe..19a54be 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + wallaby victoria ussuri train diff --git a/releasenotes/source/wallaby.rst b/releasenotes/source/wallaby.rst new file mode 100644 index 0000000..d77b565 --- /dev/null +++ b/releasenotes/source/wallaby.rst @@ -0,0 +1,6 @@ +============================ +Wallaby Series Release Notes +============================ + +.. release-notes:: + :branch: stable/wallaby -- GitLab From 02a5e4d465fbcd3727613f1887e9ac7bc2248ea4 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Thu, 18 Mar 2021 11:26:25 +0000 Subject: [PATCH 5/7] Add Python3 xena unit tests This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for xena. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: Ifb90a8ac5c35f6f6bfa7df9ccb6e1816fad59dde --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8425030..84bb45c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,7 @@ templates: - check-requirements - lib-forward-testing-python3 - - openstack-python3-wallaby-jobs + - openstack-python3-xena-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 -- GitLab From c587b7ead8895b66c2e07fb2d4388aaa3d934929 Mon Sep 17 00:00:00 2001 From: Daniel Bengtsson Date: Tue, 23 Mar 2021 13:09:08 +0100 Subject: [PATCH 6/7] Move flake8 as a pre-commit local target. The goal here is to avoid conflicts between flake8 and hacking version each 2 days. Inspired from nova's approach[1]. The flake8 version to install will be determined by hacking and requirements[2] will stay aligned instead of relying on different versions. [1] https://opendev.org/openstack/nova/src/branch/master/.pre-commit-config.yaml#L26-L35 [2] https://opendev.org/openstack/hacking/src/branch/master/requirements.txt#L1 Change-Id: I27da03673da0663c77948d9193e74fc0e906632e --- .pre-commit-config.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9d94556..08aef91 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: ebc15addedad713c86ef18ae9632c88e187dd0af # v3.1.0 + rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0 hooks: - id: trailing-whitespace # Replaces or checks mixed line ending @@ -27,9 +27,13 @@ repos: - id: debug-statements - id: check-yaml files: .*\.(yaml|yml)$ - - repo: https://gitlab.com/pycqa/flake8 - rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3 + - repo: local hooks: - id: flake8 + name: flake8 additional_dependencies: - hacking>=3.0.1,<3.1.0 + language: python + entry: flake8 + files: '^.*\.py$' + exclude: '^(doc|releasenotes|tools)/.*$' -- GitLab From 2b94a4f9ebeafc825d2b06e15a1b397072e31fbc Mon Sep 17 00:00:00 2001 From: yangyawei Date: Fri, 14 May 2021 17:29:19 +0800 Subject: [PATCH 7/7] setup.cfg: Replace dashes with underscores Setuptools v54.1.0 introduces a warning that the use of dash-separated options in 'setup.cfg' will not be supported in a future version [1]. Get ahead of the issue by replacing the dashes with underscores. Without this, we see 'UserWarning' messages like the following on new enough versions of setuptools: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead [1] https://github.com/pypa/setuptools/commit/a2e9ae4cb Change-Id: Ieac40473f778b971873ce2e5e2c95011a7aa7665 --- setup.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3d464b5..6b0ff4d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] name = oslo.serialization summary = Oslo Serialization library -description-file = +description_file = README.rst author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/oslo.serialization/latest/ -python-requires = >=3.6 +author_email = openstack-discuss@lists.openstack.org +home_page = https://docs.openstack.org/oslo.serialization/latest/ +python_requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology -- GitLab