Imported Upstream version 5.2.0

diff --git a/.zuul.yaml b/.zuul.yaml
index df57d8d9545e54f76db17dd7a6b75ab99222ffe8..0f13f8365f31d623206557e99527ebc706d7f0a1 100644 (file)
--- 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 3f12dd5918c94fbc247720106cf21fdf09eafd85..9a3f12c08b97bbd5b50b3d96dee66a22aa134f36 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,7 @@ Gaetan Semet <gaetan@xeberon.net>
 Gage Hugo <gagehugo@gmail.com>
 Gary Kotton <gkotton@redhat.com>
 Giampaolo Lauria <lauria@us.ibm.com>
+Hervé Beraud <hberaud@redhat.com>
 Ian Cordasco <graffatcolmingov@gmail.com>
 Ian Wienand <iwienand@redhat.com>
 Ian Y. Choi <ianyrchoi@gmail.com>
@@ -138,6 +139,7 @@ dineshbhor <dinesh.bhor@nttdata.com>
 jiansong <jian.song@easystack.cn>
 lifeless <robertc@robertcollins.net>
 melanie witt <melwitt@yahoo-inc.com>
+melissaml <ma.lei@99cloud.net>
 nizam <abdul.nizamuddin@nectechnologies.in>
 qingszhao <zhao.daqing@99cloud.net>
 weiweigu <gu.weiwei@zte.com.cn>

diff --git a/ChangeLog b/ChangeLog
index f4d79945b027e2f3757ea19abd3fceaca7def6b2..6355e667480113b868a925db91f9715823337e3e 100644 (file)
--- 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 f9c769e6fb5630406ff4efd53b32012c84103240..47b4298ab3aabc440777e38e9e277a68990af67f 100644 (file)
--- 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 2e58fee4b7171b29a5487686b54a74b0b098c86d..3fa75696b4e4c9750e257621688fc6d921a3699a 100644 (file)
--- 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 f9c769e6fb5630406ff4efd53b32012c84103240..47b4298ab3aabc440777e38e9e277a68990af67f 100644 (file)
--- 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 d4a7889728f9e8b90d1ba11d07908d6419c27ce4..8a3d98d2827673c32fe925d065e322d99ec4866c 100644 (file)
--- 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 0ee6f53255460247caafddda8d6ea15a1dbd3627..ccd14aba3f54fbfac410d59531367fc1a7c4901e 100644 (file)
--- 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 6c490a933cdc99b5e58301c304d97b51fe92deb9..6814ac7b2c2bb31ce72213e26dba87d219ab6ecb 100644 (file)
--- 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 bf4c26a2758ac178ed115f9bec0e731c14d80acf..3929f0dbbce0bb6296aebd76f024d16ba07b94f5 100644 (file)
--- 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 4c760812e78c422bf1f980acd02f37979ebf534b..55d73f8b4087bd928c4e1d28de744c267aadc995 100644 (file)
--- 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 9b48a340f71b3140f49b676f10a8c744a99e2550..c3591cece552c1f8993982d83020434ecfa69c76 100644 (file)
--- 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 a8fb806ebd8ab61db7222d2625ef4379eff00351..554d44b2602cb995b03518c4402d3f8969ded9f2 100644 (file)
--- 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 (file)
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 2a7e77274560a987d23f7435a0b3c91d17cb64e8..3b431e141692c09588d5499b76d5c68e7d87ab38 100644 (file)
--- 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