From 11cf070f9412363ba3cec9e746b34d06c6f73a0b Mon Sep 17 00:00:00 2001 From: qingszhao Date: Tue, 4 Dec 2018 13:17:23 +0000 Subject: [PATCH 01/12] Change openstack-dev to openstack-discuss Mailinglists have been updated. Openstack-discuss replaces openstack-dev. Change-Id: I18a5f9696659bce3c03018b636968d5c3c96dc73 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 6fa3c423..b26be54c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = pbr author = OpenStack -author-email = openstack-dev@lists.openstack.org +author-email = openstack-discuss@lists.openstack.org summary = Python Build Reasonableness description-file = README.rst From a9b31113b76bde3debc696c1ce71aa7dd594faa3 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Mon, 7 Jan 2019 15:34:45 +0000 Subject: [PATCH 02/12] Do not globally replace path prefix If a subdirectory contained the source prefix in it's name, this was replaced globally e.g using share/ansible = ansible/*, with the following directory structure: ansible/roles/kolla-ansible/test would result in the files being installed as follows: share/ansible/roles/kolla-share/test whereas we expected: share/ansible/roles/kolla-ansible/test This patch changes the behavior so that only the first occurance is replaced. Change-Id: I0aab845315dab0aaccd5f67725d2ebcf0fd08aef Fixes-Bug: 1810804 --- pbr/hooks/files.py | 8 +++++-- pbr/tests/test_files.py | 21 +++++++++++++++++++ ...f-src-prefix-in-glob-eb850b94ca96993e.yaml | 9 ++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/fix-global-replace-of-src-prefix-in-glob-eb850b94ca96993e.yaml diff --git a/pbr/hooks/files.py b/pbr/hooks/files.py index 48bf9e31..750ac32c 100644 --- a/pbr/hooks/files.py +++ b/pbr/hooks/files.py @@ -58,8 +58,12 @@ def expand_globs(self): if not target.endswith(os.path.sep): target += os.path.sep for (dirpath, dirnames, fnames) in os.walk(source_prefix): - finished.append( - "%s = " % dirpath.replace(source_prefix, target)) + # As source_prefix is always matched, using replace with a + # a limit of one is always going to replace the path prefix + # and not accidentally replace some text in the middle of + # the path + new_prefix = dirpath.replace(source_prefix, target, 1) + finished.append("%s = " % new_prefix) finished.extend( [" %s" % os.path.join(dirpath, f) for f in fnames]) else: diff --git a/pbr/tests/test_files.py b/pbr/tests/test_files.py index e60b6ca7..ed67f7bc 100644 --- a/pbr/tests/test_files.py +++ b/pbr/tests/test_files.py @@ -35,15 +35,20 @@ def setUp(self): ]) self.useFixture(pkg_fixture) pkg_etc = os.path.join(pkg_fixture.base, 'etc') + pkg_ansible = os.path.join(pkg_fixture.base, 'ansible', + 'kolla-ansible', 'test') pkg_sub = os.path.join(pkg_etc, 'sub') subpackage = os.path.join( pkg_fixture.base, 'fake_package', 'subpackage') os.makedirs(pkg_sub) os.makedirs(subpackage) + os.makedirs(pkg_ansible) with open(os.path.join(pkg_etc, "foo"), 'w') as foo_file: foo_file.write("Foo Data") with open(os.path.join(pkg_sub, "bar"), 'w') as foo_file: foo_file.write("Bar Data") + with open(os.path.join(pkg_ansible, "baz"), 'w') as baz_file: + baz_file.write("Baz Data") with open(os.path.join(subpackage, "__init__.py"), 'w') as foo_file: foo_file.write("# empty") @@ -76,3 +81,19 @@ def test_data_files_globbing(self): self.assertIn( '\netc/pbr/ = \n etc/foo\netc/pbr/sub = \n etc/sub/bar', config['files']['data_files']) + + def test_data_files_globbing_source_prefix_in_directory_name(self): + # We want to test that the string, "docs", is not replaced in a + # subdirectory name, "sub-docs" + config = dict( + files=dict( + data_files="\n share/ansible = ansible/*" + ) + ) + files.FilesConfig(config, 'fake_package').run() + self.assertIn( + '\nshare/ansible/ = ' + '\nshare/ansible/kolla-ansible = ' + '\nshare/ansible/kolla-ansible/test = ' + '\n ansible/kolla-ansible/test/baz', + config['files']['data_files']) diff --git a/releasenotes/notes/fix-global-replace-of-src-prefix-in-glob-eb850b94ca96993e.yaml b/releasenotes/notes/fix-global-replace-of-src-prefix-in-glob-eb850b94ca96993e.yaml new file mode 100644 index 00000000..b2895aa1 --- /dev/null +++ b/releasenotes/notes/fix-global-replace-of-src-prefix-in-glob-eb850b94ca96993e.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Fixes a bug where the directory names of items specified in ``data_files`` + could be renamed if the source prefix glob was contained within the + directory name. See `bug 1810804 + `_ for details. For more + information on ``data_files``, see the `distutils documentation + `_. From bc4193b183bb58c56cb3b46c04b763aebba09c54 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Tue, 28 Aug 2018 21:39:48 +0000 Subject: [PATCH 03/12] Ignore --find-links in requirements file We already skip things like --index-url, but --find-links can also be present and also shouldn't be included in install_requires. This also fixes some issues with the existing unit test for this filtering. Change-Id: Ie8eca8c19e955d52722feaa71d5843ccd74b0da0 Closes-Bug: 1716808 --- pbr/packaging.py | 3 ++- pbr/tests/test_packaging.py | 10 ++++++---- .../notes/ignore-find-links-07cf54f465aa33a6.yaml | 6 ++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml diff --git a/pbr/packaging.py b/pbr/packaging.py index bb0ec6b5..c1d729f4 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -116,7 +116,8 @@ def egg_fragment(match): continue # Ignore index URL lines - if re.match(r'^\s*(-i|--index-url|--extra-index-url).*', line): + if re.match(r'^\s*(-i|--index-url|--extra-index-url|--find-links).*', + line): continue # Handle nested requirements files such as: diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py index 9bd91ae0..50922d2c 100644 --- a/pbr/tests/test_packaging.py +++ b/pbr/tests/test_packaging.py @@ -532,11 +532,13 @@ def test_index_present(self): tempdir = tempfile.mkdtemp() requirements = os.path.join(tempdir, 'requirements.txt') with open(requirements, 'w') as f: - f.write('-i https://myindex.local') - f.write(' --index-url https://myindex.local') - f.write(' --extra-index-url https://myindex.local') + f.write('-i https://myindex.local\n') + f.write(' --index-url https://myindex.local\n') + f.write(' --extra-index-url https://myindex.local\n') + f.write('--find-links https://myindex.local\n') + f.write('arequirement>=1.0\n') result = packaging.parse_requirements([requirements]) - self.assertEqual([], result) + self.assertEqual(['arequirement>=1.0'], result) def test_nested_requirements(self): tempdir = tempfile.mkdtemp() diff --git a/releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml b/releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml new file mode 100644 index 00000000..0d10a264 --- /dev/null +++ b/releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + PBR now ignores ``--find-links`` in requirements files. This option is not + a valid ``install_requires`` entry for setuptools and thus breaks + PBR-based installs. From f3811cb72bd26feb0c63a54892da4d0431c9ed3c Mon Sep 17 00:00:00 2001 From: melissaml Date: Sat, 15 Dec 2018 16:08:37 +0800 Subject: [PATCH 04/12] Change openstack-dev to openstack-discuss Mailinglists have been updated. Openstack-discuss replaces openstack-dev. Change-Id: Ifc72c767e76283df4608da8d7097ef86c367a5cf --- doc/source/user/using.rst | 2 +- pbr/tests/testpackage/setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/user/using.rst b/doc/source/user/using.rst index 2e58fee4..14cbfe43 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 diff --git a/pbr/tests/testpackage/setup.cfg b/pbr/tests/testpackage/setup.cfg index bf4c26a2..3929f0db 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/ From e28fc7e8702826a5325db35472a51fec5068aff7 Mon Sep 17 00:00:00 2001 From: Brandon LeBlanc Date: Fri, 14 Dec 2018 16:13:55 -0600 Subject: [PATCH 05/12] Resolve ``ValueError`` when mapping value contains a literal ``=``. Example ``setup.cfg``:: project_urls = Documentation = https://format-pipfile.readthedocs.io/en/latest/?badge=latest Current result:: $ ./setup.py ERROR:root:Error parsing Traceback (most recent call last): File "/usr/local/lib/python3.7/site-packages/pbr/core.py", line 96, in pbr attrs = util.cfg_to_args(path, dist.script_args) File "/usr/local/lib/python3.7/site-packages/pbr/util.py", line 258, in cfg_to_args kwargs = setup_cfg_to_setup_kwargs(config, script_args) File "/usr/local/lib/python3.7/site-packages/pbr/util.py", line 336, in setup_cfg_to_setup_kwargs k, v = i.split(=) ValueError: too many values to unpack (expected 2) error in setup command: Error parsing /Users/brandon/src/format-pipfile/setup.cfg: ValueError: too many values to unpack (expected 2) After changes:: $ ./setup.py egg_info [...] $ grep -i project-url *.egg-info/PKG-INFO [...] Project-URL: Documentation, https://format-pipfile.readthedocs.io/en/latest/?badge=latest [...] add unit tests {1} pbr.tests.test_util.TestMapFieldsParsingScenarios.test_project_url_parsing(simple_project_urls) [0.034230s] ... ok {1} pbr.tests.test_util.TestMapFieldsParsingScenarios.test_project_url_parsing(query_parameters) [0.029791s] ... ok Closes-Bug: #1817592 Change-Id: Ifd4c46111528d99dadee77d6aabed201d9e84bdb Signed-off-by: Brandon LeBlanc --- pbr/tests/test_util.py | 67 +++++++++++++++---- pbr/util.py | 2 +- ...lode-with-equal-sign-41bf822fa4dd0e68.yaml | 7 ++ 3 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/fix-mapping-value-explode-with-equal-sign-41bf822fa4dd0e68.yaml diff --git a/pbr/tests/test_util.py b/pbr/tests/test_util.py index 370a7dee..6c490a93 100644 --- a/pbr/tests/test_util.py +++ b/pbr/tests/test_util.py @@ -23,6 +23,19 @@ from pbr import util +def config_from_ini(ini): + config = {} + if sys.version_info >= (3, 2): + parser = configparser.ConfigParser() + else: + parser = configparser.SafeConfigParser() + ini = textwrap.dedent(six.u(ini)) + parser.readfp(io.StringIO(ini)) + for section in parser.sections(): + config[section] = dict(parser.items(section)) + return config + + class TestExtrasRequireParsingScenarios(base.BaseTestCase): scenarios = [ @@ -64,20 +77,8 @@ class TestExtrasRequireParsingScenarios(base.BaseTestCase): {} })] - def config_from_ini(self, ini): - config = {} - if sys.version_info >= (3, 2): - parser = configparser.ConfigParser() - else: - parser = configparser.SafeConfigParser() - ini = textwrap.dedent(six.u(ini)) - parser.readfp(io.StringIO(ini)) - for section in parser.sections(): - config[section] = dict(parser.items(section)) - return config - def test_extras_parsing(self): - config = self.config_from_ini(self.config_text) + config = config_from_ini(self.config_text) kwargs = util.setup_cfg_to_setup_kwargs(config) self.assertEqual(self.expected_extra_requires, @@ -89,3 +90,43 @@ class TestInvalidMarkers(base.BaseTestCase): def test_invalid_marker_raises_error(self): config = {'extras': {'test': "foo :bad_marker>'1.0'"}} self.assertRaises(SyntaxError, util.setup_cfg_to_setup_kwargs, config) + + +class TestMapFieldsParsingScenarios(base.BaseTestCase): + + scenarios = [ + ('simple_project_urls', { + 'config_text': """ + [metadata] + project_urls = + Bug Tracker = https://bugs.launchpad.net/pbr/ + Documentation = https://docs.openstack.org/pbr/ + Source Code = https://git.openstack.org/cgit/openstack-dev/pbr/ + """, # noqa: E501 + 'expected_project_urls': { + 'Bug Tracker': 'https://bugs.launchpad.net/pbr/', + 'Documentation': 'https://docs.openstack.org/pbr/', + 'Source Code': 'https://git.openstack.org/cgit/openstack-dev/pbr/', # noqa: E501 + }, + }), + ('query_parameters', { + 'config_text': """ + [metadata] + project_urls = + Bug Tracker = https://bugs.launchpad.net/pbr/?query=true + Documentation = https://docs.openstack.org/pbr/?foo=bar + Source Code = https://git.openstack.org/cgit/openstack-dev/pbr/commit/?id=hash + """, # noqa: E501 + 'expected_project_urls': { + 'Bug Tracker': 'https://bugs.launchpad.net/pbr/?query=true', + 'Documentation': 'https://docs.openstack.org/pbr/?foo=bar', + 'Source Code': 'https://git.openstack.org/cgit/openstack-dev/pbr/commit/?id=hash', # noqa: E501 + }, + }), + ] + + def test_project_url_parsing(self): + config = config_from_ini(self.config_text) + kwargs = util.setup_cfg_to_setup_kwargs(config) + + self.assertEqual(self.expected_project_urls, kwargs['project_urls']) diff --git a/pbr/util.py b/pbr/util.py index 63e913d9..4c760812 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -333,7 +333,7 @@ def setup_cfg_to_setup_kwargs(config, script_args=()): elif arg in MAP_FIELDS: in_cfg_map = {} for i in split_multiline(in_cfg_value): - k, v = i.split('=') + k, v = i.split('=', 1) in_cfg_map[k.strip()] = v.strip() in_cfg_value = in_cfg_map elif arg in BOOL_FIELDS: diff --git a/releasenotes/notes/fix-mapping-value-explode-with-equal-sign-41bf822fa4dd0e68.yaml b/releasenotes/notes/fix-mapping-value-explode-with-equal-sign-41bf822fa4dd0e68.yaml new file mode 100644 index 00000000..3898587e --- /dev/null +++ b/releasenotes/notes/fix-mapping-value-explode-with-equal-sign-41bf822fa4dd0e68.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fix mapping error on values who contains a literal ``=``. Example when + setup.cfg contains content like the following project urls configuration + "project_urls = Documentation = http://foo.bar/?badge=latest". + https://bugs.launchpad.net/pbr/+bug/1817592 From 2e3aa0d8519a35a6935aadb2e3322c58f9367fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Wed, 27 Feb 2019 14:28:34 +0100 Subject: [PATCH 06/12] Fix error when keywords are defined as a list in cfg When keywords are defined as a list in cfg file the generated output have errors and breaks metadata generation. Change-Id: Ie8a5f30d6af1e81ecf3ca40bc94bc460cca38179 Closes-Bug: #1811475 --- pbr/tests/test_core.py | 2 +- pbr/tests/test_util.py | 30 +++++++++++++++++++ pbr/util.py | 4 +-- ...keywords-as-cfg-list-6cadc5141429d7f5.yaml | 7 +++++ 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml diff --git a/pbr/tests/test_core.py b/pbr/tests/test_core.py index 0ee6f532..ccd14aba 100644 --- a/pbr/tests/test_core.py +++ b/pbr/tests/test_core.py @@ -74,7 +74,7 @@ def test_setup_py_keywords(self): 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 6c490a93..8370bf1d 100644 --- a/pbr/tests/test_util.py +++ b/pbr/tests/test_util.py @@ -130,3 +130,33 @@ def test_project_url_parsing(self): 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']) diff --git a/pbr/util.py b/pbr/util.py index 4c760812..5bb731b2 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -146,6 +146,7 @@ "dependency_links", "setup_requires", "tests_require", + "keywords", "cmdclass") # setup() arguments that can have mapping values in setup.cfg @@ -154,8 +155,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 --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 00000000..215a1645 --- /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` are + considered as ``CSV_FIELDS`` and with these changes `keywords` are + now ``MULTI_FIELDS``. Refer to https://bugs.launchpad.net/pbr/+bug/1811475 + for further reading. From b30335f5169fa24838d0df1d919b27ee8c6169ce Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Tue, 19 Mar 2019 14:07:03 +0000 Subject: [PATCH 07/12] Remove libzmq-dev from integration.sh package install It appears this no longer exists on bionic, and we shouldn't need it for pbr tests. I suspect this may have been some copy-pasta from another project's integration tests. Change-Id: Ife631f77a92ee0b34c19e77cad782d94d18f2e74 Closes-Bug: 1820855 --- tools/integration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/integration.sh b/tools/integration.sh index 2a7e7727..3b431e14 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 From 6fe7f659de7d3f62349c8721060f106c38e60dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 19 Mar 2019 14:06:25 +0100 Subject: [PATCH 08/12] Fix nits and typos on release note message. Fixing some nits and typos. Change-Id: Ia6c2dbcd99d88bf23e5e8fda7ba9321c7f6cc3aa --- .../notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml b/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml index 215a1645..8e9c4657 100644 --- a/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml +++ b/releasenotes/notes/fix-keywords-as-cfg-list-6cadc5141429d7f5.yaml @@ -1,7 +1,7 @@ --- fixes: - | - Fix error when ``keywords`` argument as a cfg list. Previously `keywords` are - considered as ``CSV_FIELDS`` and with these changes `keywords` are - now ``MULTI_FIELDS``. Refer to https://bugs.launchpad.net/pbr/+bug/1811475 - for further reading. + 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. From 08b42cae514c0e47a9358c6e233708d6311a6628 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Sun, 24 Mar 2019 20:35:35 +0000 Subject: [PATCH 09/12] Replace openstack.org git:// URLs with https:// This is a mechanically generated change to replace openstack.org git:// URLs with https:// equivalents. This is in aid of a planned future move of the git hosting infrastructure to a self-hosted instance of gitea (https://gitea.io), which does not support the git wire protocol at this stage. This update should result in no functional change. For more information see the thread at http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html Change-Id: I1d81f12d728b628f5f6efc0ffb812246c0c2fef8 --- playbooks/legacy/pbr-installation-devstack/run.yaml | 2 +- playbooks/legacy/pbr-installation-upstream-devstack/run.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/legacy/pbr-installation-devstack/run.yaml b/playbooks/legacy/pbr-installation-devstack/run.yaml index 9b48a340..aeb5efa5 100644 --- a/playbooks/legacy/pbr-installation-devstack/run.yaml +++ b/playbooks/legacy/pbr-installation-devstack/run.yaml @@ -17,7 +17,7 @@ dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ + https://git.openstack.org \ openstack-infra/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml index a8fb806e..8b3fa7d9 100644 --- a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml +++ b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml @@ -17,7 +17,7 @@ dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ + https://git.openstack.org \ openstack-infra/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' From 7f9d653c29cda5e0b504ef24a916e476c81b627e Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Wed, 29 Aug 2018 17:38:15 +0000 Subject: [PATCH 10/12] Support provides_extra metadata This was added to setuptools in [1] so we should support passing it through from pbr. Change-Id: I46493c18756bcb01c53575ab51ec5e5e97670fc3 1: https://github.com/pypa/setuptools/commit/b2ea3c4a20d008622caec445f5b6916ddd420d16 Closes-Bug: 1760938 --- pbr/tests/test_util.py | 12 ++++++++++++ pbr/util.py | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pbr/tests/test_util.py b/pbr/tests/test_util.py index 8370bf1d..6814ac7b 100644 --- a/pbr/tests/test_util.py +++ b/pbr/tests/test_util.py @@ -160,3 +160,15 @@ def test_keywords_parsing(self): 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/util.py b/pbr/util.py index 5bb731b2..55d73f8b 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -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",), @@ -147,7 +148,8 @@ "setup_requires", "tests_require", "keywords", - "cmdclass") + "cmdclass", + "provides_extras") # setup() arguments that can have mapping values in setup.cfg MAP_FIELDS = ("project_urls",) From fba29ab4f1c165843bc8db08c86dbdbaff9defdc Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Wed, 20 Mar 2019 17:15:20 +0000 Subject: [PATCH 11/12] Typo fix: s/extract_mesages/extract_messages/ Change-Id: If4141dd8e8876fc3d9d3e7579177a44f7c7da563 --- doc/source/user/using.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/user/using.rst b/doc/source/user/using.rst index 14cbfe43..3fa75696 100644 --- a/doc/source/user/using.rst +++ b/doc/source/user/using.rst @@ -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:: From 55429ef85692298a6f2dacb38bfa27f2aac5477f Mon Sep 17 00:00:00 2001 From: OpenDev Sysadmins Date: Fri, 19 Apr 2019 19:36:17 +0000 Subject: [PATCH 12/12] OpenDev Migration Patch This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have. --- .gitreview | 4 ++-- .zuul.yaml | 10 +++++----- .../legacy/pbr-installation-devstack/run.yaml | 16 ++++++++-------- .../pbr-installation-upstream-devstack/run.yaml | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitreview b/.gitreview index 8df29968..ae015c0b 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 -project=openstack-dev/pbr.git +project=openstack/pbr.git diff --git a/.zuul.yaml b/.zuul.yaml index df57d8d9..0f13f836 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/playbooks/legacy/pbr-installation-devstack/run.yaml b/playbooks/legacy/pbr-installation-devstack/run.yaml index aeb5efa5..c3591cec 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 \ - https://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 8b3fa7d9..554d44b2 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 \ - https://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"