From a12780559094858c01140053ed2b6f18d1ab9c7d Mon Sep 17 00:00:00 2001 From: JinWang An Date: Mon, 28 Dec 2020 13:46:50 +0900 Subject: [PATCH] Imported Upstream version 5.2.0 --- .zuul.yaml | 10 ++--- AUTHORS | 2 + ChangeLog | 12 ++++++ PKG-INFO | 4 +- doc/source/user/using.rst | 4 +- pbr.egg-info/PKG-INFO | 4 +- pbr.egg-info/SOURCES.txt | 1 + pbr/tests/test_core.py | 2 +- pbr/tests/test_util.py | 42 +++++++++++++++++++ pbr/tests/testpackage/setup.cfg | 2 +- pbr/util.py | 8 ++-- .../legacy/pbr-installation-devstack/run.yaml | 16 +++---- .../run.yaml | 16 +++---- ...keywords-as-cfg-list-6cadc5141429d7f5.yaml | 7 ++++ tools/integration.sh | 2 +- 15 files changed, 99 insertions(+), 33 deletions(-) create mode 100644 releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml diff --git a/.zuul.yaml b/.zuul.yaml index df57d8d..0f13f83 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,11 +3,11 @@ parent: legacy-dsvm-base timeout: 7800 required-projects: - - openstack-dev/devstack - - openstack-dev/grenade - - openstack-dev/pbr - - openstack-infra/devstack-gate - - openstack-infra/tripleo-ci + - openstack/devstack + - openstack/grenade + - openstack/pbr + - openstack/devstack-gate + - openstack/tripleo-ci - openstack/aodh - openstack/automaton - openstack/ceilometer diff --git a/AUTHORS b/AUTHORS index 3f12dd5..9a3f12c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -45,6 +45,7 @@ Gaetan Semet Gage Hugo Gary Kotton Giampaolo Lauria +Hervé Beraud Ian Cordasco Ian Wienand Ian Y. Choi @@ -138,6 +139,7 @@ dineshbhor jiansong lifeless melanie witt +melissaml nizam qingszhao weiweigu diff --git a/ChangeLog b/ChangeLog index f4d7994..6355e66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,22 @@ CHANGES ======= +5.2.0 +----- + +* OpenDev Migration Patch +* Typo fix: s/extract\_mesages/extract\_messages/ +* Support provides\_extra metadata +* Replace openstack.org git:// URLs with https:// +* Fix nits and typos on release note message +* Remove libzmq-dev from integration.sh package install +* Fix error when keywords are defined as a list in cfg + 5.1.3 ----- * Resolve \`\`ValueError\`\` when mapping value contains a literal \`\`=\`\` +* Change openstack-dev to openstack-discuss 5.1.2 ----- diff --git a/PKG-INFO b/PKG-INFO index f9c769e..47b4298 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,13 +1,13 @@ Metadata-Version: 2.1 Name: pbr -Version: 5.1.3 +Version: 5.2.0 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN -Project-URL: Documentation, https://docs.openstack.org/pbr/ Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/ +Project-URL: Documentation, https://docs.openstack.org/pbr/ Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ Description: Introduction ============ diff --git a/doc/source/user/using.rst b/doc/source/user/using.rst index 2e58fee..3fa7569 100644 --- a/doc/source/user/using.rst +++ b/doc/source/user/using.rst @@ -49,7 +49,7 @@ versions of `setuptools`__. A simple sample can be found in *pbr*'s own [metadata] name = pbr author = OpenStack Foundation - author-email = openstack-dev@lists.openstack.org + author-email = openstack-discuss@lists.openstack.org summary = OpenStack's setup automation in a reusable form description-file = README.rst description-content-type = text/x-rst; charset=UTF-8 @@ -102,7 +102,7 @@ In addition, there are some modifications to other sections: For all other sections, you should refer to either the `setuptools`_ documentation or the documentation of the package that provides the section, -such as the ``extract_mesages`` section provided by Babel__. +such as the ``extract_messages`` section provided by Babel__. .. note:: diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO index f9c769e..47b4298 100644 --- a/pbr.egg-info/PKG-INFO +++ b/pbr.egg-info/PKG-INFO @@ -1,13 +1,13 @@ Metadata-Version: 2.1 Name: pbr -Version: 5.1.3 +Version: 5.2.0 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN -Project-URL: Documentation, https://docs.openstack.org/pbr/ Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/ +Project-URL: Documentation, https://docs.openstack.org/pbr/ Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ Description: Introduction ============ diff --git a/pbr.egg-info/SOURCES.txt b/pbr.egg-info/SOURCES.txt index d4a7889..8a3d98d 100644 --- a/pbr.egg-info/SOURCES.txt +++ b/pbr.egg-info/SOURCES.txt @@ -96,6 +96,7 @@ playbooks/legacy/pbr-installation-upstream-devstack/run.yaml releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml releasenotes/notes/fix-global-replace-of-src-prefix-in-glob-eb850b94ca96993e.yaml +releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml releasenotes/notes/fix-mapping-value-explode-with-equal-sign-41bf822fa4dd0e68.yaml releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml releasenotes/notes/long-descr-content-type-f9a1003acbb8740f.yaml diff --git a/pbr/tests/test_core.py b/pbr/tests/test_core.py index 0ee6f53..ccd14ab 100644 --- a/pbr/tests/test_core.py +++ b/pbr/tests/test_core.py @@ -74,7 +74,7 @@ class TestCore(base.BaseTestCase): self.run_setup('egg_info') stdout, _, _ = self.run_setup('--keywords') - assert stdout == 'packaging,distutils,setuptools' + assert stdout == 'packaging, distutils, setuptools' def test_setup_py_build_sphinx(self): stdout, _, return_code = self.run_setup('build_sphinx') diff --git a/pbr/tests/test_util.py b/pbr/tests/test_util.py index 6c490a9..6814ac7 100644 --- a/pbr/tests/test_util.py +++ b/pbr/tests/test_util.py @@ -130,3 +130,45 @@ class TestMapFieldsParsingScenarios(base.BaseTestCase): kwargs = util.setup_cfg_to_setup_kwargs(config) self.assertEqual(self.expected_project_urls, kwargs['project_urls']) + + +class TestKeywordsParsingScenarios(base.BaseTestCase): + + scenarios = [ + ('keywords_list', { + 'config_text': """ + [metadata] + keywords = + one + two + three + """, # noqa: E501 + 'expected_keywords': ['one', 'two', 'three'], + }, + ), + ('inline_keywords', { + 'config_text': """ + [metadata] + keywords = one, two, three + """, # noqa: E501 + 'expected_keywords': ['one, two, three'], + }), + ] + + def test_keywords_parsing(self): + config = config_from_ini(self.config_text) + kwargs = util.setup_cfg_to_setup_kwargs(config) + + self.assertEqual(self.expected_keywords, kwargs['keywords']) + + +class TestProvidesExtras(base.BaseTestCase): + def test_provides_extras(self): + ini = """ + [metadata] + provides_extras = foo + bar + """ + config = config_from_ini(ini) + kwargs = util.setup_cfg_to_setup_kwargs(config) + self.assertEqual(['foo', 'bar'], kwargs['provides_extras']) diff --git a/pbr/tests/testpackage/setup.cfg b/pbr/tests/testpackage/setup.cfg index bf4c26a..3929f0d 100644 --- a/pbr/tests/testpackage/setup.cfg +++ b/pbr/tests/testpackage/setup.cfg @@ -4,7 +4,7 @@ name = pbr_testpackage # testing postversioned codepaths. version = 0.1.dev author = OpenStack -author-email = openstack-dev@lists.openstack.org +author-email = openstack-discuss@lists.openstack.org home-page = http://pypi.python.org/pypi/pbr project_urls = Bug Tracker = https://bugs.launchpad.net/pbr/ diff --git a/pbr/util.py b/pbr/util.py index 4c76081..55d73f8 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -113,6 +113,7 @@ D1_D2_SETUP_ARGS = { "setup_requires": ("metadata", "setup_requires_dist"), "python_requires": ("metadata",), "provides": ("metadata", "provides_dist"), # ** + "provides_extras": ("metadata",), "obsoletes": ("metadata", "obsoletes_dist"), # ** "package_dir": ("files", 'packages_root'), "packages": ("files",), @@ -146,7 +147,9 @@ MULTI_FIELDS = ("classifiers", "dependency_links", "setup_requires", "tests_require", - "cmdclass") + "keywords", + "cmdclass", + "provides_extras") # setup() arguments that can have mapping values in setup.cfg MAP_FIELDS = ("project_urls",) @@ -154,8 +157,7 @@ MAP_FIELDS = ("project_urls",) # setup() arguments that contain boolean values BOOL_FIELDS = ("use_2to3", "zip_safe", "include_package_data") - -CSV_FIELDS = ("keywords",) +CSV_FIELDS = () def resolve_name(name): diff --git a/playbooks/legacy/pbr-installation-devstack/run.yaml b/playbooks/legacy/pbr-installation-devstack/run.yaml index 9b48a34..c3591ce 100644 --- a/playbooks/legacy/pbr-installation-devstack/run.yaml +++ b/playbooks/legacy/pbr-installation-devstack/run.yaml @@ -13,12 +13,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate + https://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -30,11 +30,11 @@ # Define the entire projects list here so that what we # test requirements against is independent of what d-g # thinks is relevant. - export PROJECTS="openstack-infra/devstack-gate $PROJECTS" - export PROJECTS="openstack-dev/devstack $PROJECTS" - export PROJECTS="openstack-dev/grenade $PROJECTS" - export PROJECTS="openstack-dev/pbr $PROJECTS" - export PROJECTS="openstack-infra/tripleo-ci $PROJECTS" + export PROJECTS="openstack/devstack-gate $PROJECTS" + export PROJECTS="openstack/devstack $PROJECTS" + export PROJECTS="openstack/grenade $PROJECTS" + export PROJECTS="openstack/pbr $PROJECTS" + export PROJECTS="openstack/tripleo-ci $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS" export PROJECTS="openstack/automaton $PROJECTS" export PROJECTS="openstack/ceilometer $PROJECTS" diff --git a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml index a8fb806..554d44b 100644 --- a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml +++ b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml @@ -13,12 +13,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate + https://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -30,11 +30,11 @@ # Define the entire projects list here so that what we # test requirements against is independent of what d-g # thinks is relevant. - export PROJECTS="openstack-infra/devstack-gate $PROJECTS" - export PROJECTS="openstack-dev/devstack $PROJECTS" - export PROJECTS="openstack-dev/grenade $PROJECTS" - export PROJECTS="openstack-dev/pbr $PROJECTS" - export PROJECTS="openstack-infra/tripleo-ci $PROJECTS" + export PROJECTS="openstack/devstack-gate $PROJECTS" + export PROJECTS="openstack/devstack $PROJECTS" + export PROJECTS="openstack/grenade $PROJECTS" + export PROJECTS="openstack/pbr $PROJECTS" + export PROJECTS="openstack/tripleo-ci $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS" export PROJECTS="openstack/automaton $PROJECTS" export PROJECTS="openstack/ceilometer $PROJECTS" diff --git a/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml b/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml new file mode 100644 index 0000000..8e9c465 --- /dev/null +++ b/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fix error when ``keywords`` argument as a cfg list. Previously ``keywords`` + were ``CSV_FIELDS`` and with these changes ``keywords`` are now + ``MULTI_FIELDS``. Refer to https://bugs.launchpad.net/pbr/+bug/1811475 + for more information. diff --git a/tools/integration.sh b/tools/integration.sh index 2a7e772..3b431e1 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -30,7 +30,7 @@ REPODIR=${REPODIR:-$BASE/new} # TODO: Figure out how to get this on to the box properly sudo apt-get update -sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libzmq-dev libffi-dev libldap2-dev libsasl2-dev ccache libkrb5-dev liberasurecode-dev libjpeg-dev +sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libffi-dev libldap2-dev libsasl2-dev ccache libkrb5-dev liberasurecode-dev libjpeg-dev # FOR numpy / pyyaml # The source list has been removed from our apt config so rather than -- 2.34.1