From 7e72bbf01b8e3620757ba65f21afa41470d940c5 Mon Sep 17 00:00:00 2001 From: zhangboye Date: Thu, 24 Dec 2020 15:30:27 +0800 Subject: [PATCH 1/8] 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=. Change-Id: Ice493f64ecabdeb7a66c14e1fd864c605c5384e5 --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f20db81..b255ae5 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ setenv = BRANCH_NAME=master CLIENT_NAME=oslo.service 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}/doc/requirements.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt @@ -54,7 +54,7 @@ commands = oslo_debug_helper -t oslo_service/tests {posargs} [testenv:bandit] 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 = bandit -r oslo_service -n5 -x tests {posargs} -- GitLab From e37c5d2aff49677688715f5db6bd2ee4a0ef58b8 Mon Sep 17 00:00:00 2001 From: xuanyandong Date: Sun, 3 Jan 2021 16:21:39 +0800 Subject: [PATCH 2/8] remove unicode from code Change-Id: I4cf57785a3d2e6121fbb470b57a1ba48a3549ef6 --- doc/source/conf.py | 8 ++++---- releasenotes/source/conf.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 3e96e80..f0ff4d1 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -45,8 +45,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'oslo.service' -copyright = u'2014, OpenStack Foundation' +project = 'oslo.service' +copyright = '2014, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. add_function_parentheses = True @@ -76,6 +76,6 @@ htmlhelp_basename = '%sdoc' % project latex_documents = [ ('index', '%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Foundation', 'manual'), + '%s Documentation' % project, + 'OpenStack Foundation', 'manual'), ] diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index dd1993f..da135d3 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -60,8 +60,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'oslo.service Release Notes' -copyright = u'2016, oslo.service Developers' +project = 'oslo.service Release Notes' +copyright = '2016, oslo.service Developers' # Release notes do not need a version in the title, they span # multiple versions. @@ -208,8 +208,8 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'oslo.serviceReleaseNotes.tex', - u'oslo.service Release Notes Documentation', - u'oslo.service Developers', 'manual'), + 'oslo.service Release Notes Documentation', + 'oslo.service Developers', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -239,8 +239,8 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'oslo.serviceReleaseNotes', - u'oslo.service Release Notes Documentation', - [u'oslo.service Developers'], 1) + 'oslo.service Release Notes Documentation', + ['oslo.service Developers'], 1) ] # If true, show URL addresses after external links. @@ -254,8 +254,8 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'oslo.serviceReleaseNotes', - u'oslo.service Release Notes Documentation', - u'oslo.service Developers', 'oslo.serviceReleaseNotes', + 'oslo.service Release Notes Documentation', + 'oslo.service Developers', 'oslo.serviceReleaseNotes', 'Provides a framework for defining new long-running services using the' ' patterns established by other OpenStack applications', 'Miscellaneous'), -- GitLab From 304ab7f3d6bfd4747c1b6b77503513acd253c868 Mon Sep 17 00:00:00 2001 From: "wu.shiming" Date: Fri, 19 Feb 2021 14:46:36 +0800 Subject: [PATCH 3/8] Remove lower-constraints remnants These were missed in change: Ia531606ec2526ce1c6169296a8f254342870416d Change-Id: Ibe9e1aa7501e80844ef4b4e05866c0c3cf310c86 --- lower-constraints.txt | 63 ------------------------------------------- tox.ini | 5 ---- 2 files changed, 68 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 029b96a..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,63 +0,0 @@ -alabaster==0.7.10 -appdirs==1.3.0 -Babel==2.3.4 -bandit==1.1.0 -chardet==3.0.4 -coverage==4.0 -debtcollector==1.2.0 -doc8==0.6.0 -docutils==0.11 -dulwich==0.15.0 -eventlet==0.25.2 -extras==1.0.0 -fasteners==0.7.0 -fixtures==3.0.0 -gitdb==0.6.4 -GitPython==1.0.1 -greenlet==0.4.15 -imagesize==0.7.1 -iso8601==0.1.11 -Jinja2==2.10 -keystoneauth1==3.4.0 -linecache2==1.0.0 -MarkupSafe==1.0 -mox3==0.20.0 -msgpack-python==0.4.0 -netaddr==0.7.18 -netifaces==0.10.4 -os-client-config==1.28.0 -oslo.concurrency==3.25.0 -oslo.config==5.1.0 -oslo.context==2.19.2 -oslo.i18n==3.15.3 -oslo.log==3.36.0 -oslo.serialization==2.18.0 -oslo.utils==3.40.2 -oslotest==3.2.0 -Paste==2.0.2 -PasteDeploy==1.5.0 -pbr==2.0.0 -Pygments==2.2.0 -pyinotify==0.9.6 -pyparsing==2.1.0 -python-dateutil==2.5.3 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.13 -repoze.lru==0.7 -requests==2.14.2 -requestsexceptions==1.2.0 -restructuredtext-lint==1.1.1 -rfc3986==0.3.1 -Routes==2.3.1 -smmap==0.9.0 -snowballstemmer==1.2.1 -stestr==2.0.0 -stevedore==1.20.0 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -WebOb==1.7.1 -wrapt==1.7.0 -Yappi==1.0 diff --git a/tox.ini b/tox.ini index 2e1e2e3..50f850a 100644 --- a/tox.ini +++ b/tox.ini @@ -66,8 +66,3 @@ 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 -- GitLab From dbcdc2203819fce536b7800dc940595fdbea2306 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Thu, 18 Mar 2021 11:28:15 +0000 Subject: [PATCH 4/8] 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: Ife270ffd6fb617711cd1b5e73882b02ee1aa3fe0 --- 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 05123c9..0d4a4e6 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 08f929bd799964013557ce59ac7497e4f97b0906 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Thu, 18 Mar 2021 11:28:27 +0000 Subject: [PATCH 5/8] 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: I30ed0b85d83488def2886f772e2f59d650400f66 --- .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 900692743eaf8c3a9bb1e797757c79843e0940e3 Mon Sep 17 00:00:00 2001 From: Daniel Bengtsson Date: Tue, 23 Mar 2021 13:09:30 +0100 Subject: [PATCH 6/8] 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: Ie1d59a73d47d8042d669304da802b9f9a34a81a9 --- .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 aea7627eb033d15f9eeccb0b576032119a1c03dc Mon Sep 17 00:00:00 2001 From: dengzhaosen Date: Tue, 27 Apr 2021 15:32:50 +0800 Subject: [PATCH 7/8] Remove references to 'sys.version_info' We support Python 3.6 as a minimum now, making these checks no-ops. Change-Id: Ibaa2cdb7cc27f541aeb778782813354df2911156 --- oslo_service/service.py | 7 +++---- oslo_service/tests/test_service.py | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/oslo_service/service.py b/oslo_service/service.py index c9d6bd0..fa9c37c 100644 --- a/oslo_service/service.py +++ b/oslo_service/service.py @@ -197,12 +197,11 @@ class SignalHandler(metaclass=Singleton): def __setup_signal_interruption(self): """Set up to do the Right Thing with signals during poll() and sleep(). - For Python 3.5 and later, deal with the changes in PEP 475 that prevent - a signal from interrupting eventlet's call to poll() or sleep(). + Deal with the changes introduced in PEP 475 that prevent a signal from + interrupting eventlet's call to poll() or sleep(). """ select_module = eventlet.patcher.original('select') - self.__force_interrupt_on_signal = (sys.version_info >= (3, 5) and - hasattr(select_module, 'poll')) + self.__force_interrupt_on_signal = hasattr(select_module, 'poll') if self.__force_interrupt_on_signal: try: diff --git a/oslo_service/tests/test_service.py b/oslo_service/tests/test_service.py index 58be122..fad33e9 100644 --- a/oslo_service/tests/test_service.py +++ b/oslo_service/tests/test_service.py @@ -476,7 +476,6 @@ class ProcessLauncherTest(base.ServiceBaseTestCase): m.assert_called_once_with(signal.SIGTERM, 'test') signal_handler.clear() - @mock.patch('sys.version_info', (3, 5)) def test_setup_signal_interruption_no_select_poll(self): # NOTE(claudiub): SignalHandler is a singleton, which means that it # might already be initialized. We need to clear to clear the cache @@ -490,7 +489,6 @@ class ProcessLauncherTest(base.ServiceBaseTestCase): self.assertFalse( signal_handler._SignalHandler__force_interrupt_on_signal) - @mock.patch('sys.version_info', (3, 5)) def test_setup_signal_interruption_select_poll(self): # NOTE(claudiub): SignalHandler is a singleton, which means that it # might already be initialized. We need to clear to clear the cache -- GitLab From 19f369a6e580cbb4d8768966cca302632ad420bf Mon Sep 17 00:00:00 2001 From: YuehuiLei Date: Wed, 5 May 2021 09:57:31 +0800 Subject: [PATCH 8/8] 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: Ide75d5a0fb9215a81f0410b6ffa77849463cf888 --- setup.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index bd3f335..902899e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] name = oslo.service summary = oslo.service library -description-file = +description_file = README.rst author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/oslo.service/latest/ -python-requires = >=3.6 +author_email = openstack-discuss@lists.openstack.org +home_page = https://docs.openstack.org/oslo.service/latest/ +python_requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology -- GitLab