commit python-pbr for openSUSE:Factory

16 May 2019

Hello community,

here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2019-05-16 21:59:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pbr (Old)
 and      /work/SRC/openSUSE:Factory/.python-pbr.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-pbr"

Thu May 16 21:59:03 2019 rev:46 rq:703254 version:5.2.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/python-pbr/python-pbr.changes	2019-03-29 20:38:35.954676063 +0100
+++ /work/SRC/openSUSE:Factory/.python-pbr.new.5148/python-pbr.changes	2019-05-16 21:59:04.618809694 +0200
@@ -1,0 +2,13 @@
+Wed May 15 17:01:50 UTC 2019 - Jonathan Harker <jharker@suse.com>
+
+- Update to 5.2.0
+  * Support provides_extra metadata
+  * Remove libzmq-dev from integration.sh package install
+  * Fix error when keywords are defined as a list in cfg
+
+-------------------------------------------------------------------
+Mon May 13 21:53:14 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Do not generate any packages in the test multibuild run
+
+-------------------------------------------------------------------

Old:
----
  pbr-5.1.3.tar.gz

New:
----
  pbr-5.2.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-pbr.spec ++++++
--- /var/tmp/diff_new_pack.l2KFig/_old	2019-05-16 21:59:05.142809465 +0200
+++ /var/tmp/diff_new_pack.l2KFig/_new	2019-05-16 21:59:05.146809463 +0200
@@ -26,7 +26,7 @@
 %bcond_with test
 %endif
 Name:           python-pbr%{psuffix}
-Version:        5.1.3
+Version:        5.2.0
 Release:        0
 Summary:        Python Build Reasonableness
 License:        Apache-2.0
@@ -77,39 +77,34 @@
 
 %prep
 %setup -q -n pbr-%{version}
-%autopatch -p1
 
 sed -i '/coverage/d;/hacking/d' test-requirements.txt
 
 %build
 %python_build
 
-%install
+%if %{with test}
+%check
+export OS_TEST_TIMEOUT=60
+%python_exec -m stestr run
+%endif
+
 %if !%{with test}
+%install
 %python_install
 %python_expand rm -rf  %{buildroot}%{$python_sitelib}/pbr/tests
 %python_clone -a %{buildroot}%{_bindir}/pbr
 
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
-%endif
 
-%if %{with test}
-%check
-export OS_TEST_TIMEOUT=60
-%python_exec -m stestr.cli run
-%endif
-
-%if !%{with test}
 %post
 %python_install_alternative pbr
 
 %postun
 %python_uninstall_alternative pbr
-%endif
 
 %files %{python_files}
 %license LICENSE
-%if !%{with test}
 %doc AUTHORS ChangeLog CONTRIBUTING.rst README.rst
 %python_alternative %{_bindir}/pbr
 %{python_sitelib}/pbr

++++++ pbr-5.1.3.tar.gz -> pbr-5.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/.zuul.yaml new/pbr-5.2.0/.zuul.yaml
--- old/pbr-5.1.3/.zuul.yaml	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/.zuul.yaml	2019-04-26 18:51:36.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/AUTHORS new/pbr-5.2.0/AUTHORS
--- old/pbr-5.1.3/AUTHORS	2019-02-28 19:10:35.000000000 +0100
+++ new/pbr-5.2.0/AUTHORS	2019-04-26 18:55:24.000000000 +0200
@@ -45,6 +45,7 @@
 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 @@
 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/ChangeLog new/pbr-5.2.0/ChangeLog
--- old/pbr-5.1.3/ChangeLog	2019-02-28 19:10:35.000000000 +0100
+++ new/pbr-5.2.0/ChangeLog	2019-04-26 18:55:24.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/PKG-INFO new/pbr-5.2.0/PKG-INFO
--- old/pbr-5.1.3/PKG-INFO	2019-02-28 19:10:35.000000000 +0100
+++ new/pbr-5.2.0/PKG-INFO	2019-04-26 18:55:24.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/doc/source/user/using.rst new/pbr-5.2.0/doc/source/user/using.rst
--- old/pbr-5.1.3/doc/source/user/using.rst	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/doc/source/user/using.rst	2019-04-26 18:51:36.000000000 +0200
@@ -49,7 +49,7 @@
     [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 @@
 
 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/pbr/tests/test_core.py new/pbr-5.2.0/pbr/tests/test_core.py
--- old/pbr-5.1.3/pbr/tests/test_core.py	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/pbr/tests/test_core.py	2019-04-26 18:51:36.000000000 +0200
@@ -74,7 +74,7 @@
 
         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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/pbr/tests/test_util.py new/pbr-5.2.0/pbr/tests/test_util.py
--- old/pbr-5.1.3/pbr/tests/test_util.py	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/pbr/tests/test_util.py	2019-04-26 18:51:36.000000000 +0200
@@ -130,3 +130,45 @@
         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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/pbr/tests/testpackage/setup.cfg new/pbr-5.2.0/pbr/tests/testpackage/setup.cfg
--- old/pbr-5.1.3/pbr/tests/testpackage/setup.cfg	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/pbr/tests/testpackage/setup.cfg	2019-04-26 18:51:36.000000000 +0200
@@ -4,7 +4,7 @@
 # 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/pbr/util.py new/pbr-5.2.0/pbr/util.py
--- old/pbr-5.1.3/pbr/util.py	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/pbr/util.py	2019-04-26 18:51:36.000000000 +0200
@@ -113,6 +113,7 @@
     "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 @@
                 "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 @@
 # 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/pbr.egg-info/PKG-INFO new/pbr-5.2.0/pbr.egg-info/PKG-INFO
--- old/pbr-5.1.3/pbr.egg-info/PKG-INFO	2019-02-28 19:10:35.000000000 +0100
+++ new/pbr-5.2.0/pbr.egg-info/PKG-INFO	2019-04-26 18:55:24.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/pbr.egg-info/SOURCES.txt new/pbr-5.2.0/pbr.egg-info/SOURCES.txt
--- old/pbr-5.1.3/pbr.egg-info/SOURCES.txt	2019-02-28 19:10:35.000000000 +0100
+++ new/pbr-5.2.0/pbr.egg-info/SOURCES.txt	2019-04-26 18:55:24.000000000 +0200
@@ -96,6 +96,7 @@
 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/playbooks/legacy/pbr-installation-devstack/run.yaml new/pbr-5.2.0/playbooks/legacy/pbr-installation-devstack/run.yaml
--- old/pbr-5.1.3/playbooks/legacy/pbr-installation-devstack/run.yaml	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/playbooks/legacy/pbr-installation-devstack/run.yaml	2019-04-26 18:51:36.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml new/pbr-5.2.0/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml
--- old/pbr-5.1.3/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml	2019-04-26 18:51:36.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml new/pbr-5.2.0/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml
--- old/pbr-5.1.3/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml	1970-01-01 01:00:00.000000000 +0100
+++ new/pbr-5.2.0/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml	2019-04-26 18:51:36.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.1.3/tools/integration.sh new/pbr-5.2.0/tools/integration.sh
--- old/pbr-5.1.3/tools/integration.sh	2019-02-28 19:08:19.000000000 +0100
+++ new/pbr-5.2.0/tools/integration.sh	2019-04-26 18:51:36.000000000 +0200
@@ -30,7 +30,7 @@
 
 # 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

    

root

tags

participants (1)