diff options
| -rw-r--r-- | CONTRIBUTING.rst | 4 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | doc/source/conf.py | 9 | ||||
| -rw-r--r-- | doc/source/user/history.rst | 1 | ||||
| -rw-r--r-- | doc/source/user/index.rst | 1 | ||||
| -rw-r--r-- | doc/source/user/using.rst | 2 | ||||
| -rw-r--r-- | pbr/tests/test_util.py | 4 | ||||
| -rw-r--r-- | pbr/tests/testpackage/setup.cfg | 2 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 15 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
11 files changed, 29 insertions, 16 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 51b3e69..33adff5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,13 +1,13 @@ If you would like to contribute to the development of OpenStack, you must follow the steps in this page: - http://docs.openstack.org/infra/manual/developers.html + https://docs.opendev.org/opendev/infra-manual/latest/developers.html Once those steps have been completed, changes to OpenStack should be submitted for review via the Gerrit tool, following the workflow documented at: - http://docs.openstack.org/infra/manual/developers.html#development-workflow + https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow Pull requests submitted through GitHub will be ignored. @@ -32,9 +32,9 @@ them as quickly as possible. * License: Apache License, Version 2.0 * Documentation: https://docs.openstack.org/pbr/latest/ -* Source: https://git.openstack.org/cgit/openstack-dev/pbr +* Source: https://opendev.org/openstack/pbr * Bugs: https://bugs.launchpad.net/pbr -* Change Log: https://docs.openstack.org/pbr/latest/user/history.html +* ChangeLog: https://docs.openstack.org/pbr/latest/user/history.html .. _d2to1: https://pypi.python.org/pypi/d2to1 .. _distutils2: https://pypi.python.org/pypi/Distutils2 diff --git a/doc/source/conf.py b/doc/source/conf.py index 13f63a0..aa51538 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -17,10 +17,17 @@ except ImportError: openstackdocstheme = None # openstackdocstheme options + +# Deprecated options for docstheme < 2.2.0, can be removed once +# pbr stops supporting py27. repository_name = 'openstack/pbr' bug_project = 'pbr' bug_tag = '' -html_last_updated_fmt = '%Y-%m-%d %H:%M' +# New options with openstackdocstheme >=2.2.0 +openstackdocs_repo_name = 'openstack/pbr' +openstackdocs_auto_name = False +openstackdocs_bug_project = 'pbr' +openstackdocs_bug_tag = '' # autodoc generation is a bit aggressive and a nuisance when doing heavy # text edit cycles. diff --git a/doc/source/user/history.rst b/doc/source/user/history.rst new file mode 100644 index 0000000..f69be70 --- /dev/null +++ b/doc/source/user/history.rst @@ -0,0 +1 @@ +.. include:: ../../../ChangeLog diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index 0629e2e..7854dc5 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -9,3 +9,4 @@ packagers semver compatibility + history diff --git a/doc/source/user/using.rst b/doc/source/user/using.rst index 3fa7569..b9659d0 100644 --- a/doc/source/user/using.rst +++ b/doc/source/user/using.rst @@ -57,7 +57,7 @@ versions of `setuptools`__. A simple sample can be found in *pbr*'s own 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/ + Source Code = https://opendev.org/openstack/pbr license = Apache-2 classifier = Development Status :: 4 - Beta diff --git a/pbr/tests/test_util.py b/pbr/tests/test_util.py index a9fdf6e..0a02fc1 100644 --- a/pbr/tests/test_util.py +++ b/pbr/tests/test_util.py @@ -103,12 +103,12 @@ class TestMapFieldsParsingScenarios(base.BaseTestCase): 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/ + Source Code = https://opendev.org/openstack/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 + 'Source Code': 'https://opendev.org/openstack/pbr', }, }), ('query_parameters', { diff --git a/pbr/tests/testpackage/setup.cfg b/pbr/tests/testpackage/setup.cfg index ab31e95..e323252 100644 --- a/pbr/tests/testpackage/setup.cfg +++ b/pbr/tests/testpackage/setup.cfg @@ -9,7 +9,7 @@ home-page = http://pypi.python.org/pypi/pbr 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/ + Source Code = https://opendev.org/openstack/pbr summary = Test package for testing pbr description-file = README.txt diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 56f7ecd..0c3627c 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -41,13 +41,16 @@ release = '' # a list of builtin themes. html_theme = 'openstackdocs' -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - - # -- Options for openstackdocstheme --------------------------------------- -repository_name = 'openstack-dev/pbr' +# Deprecated options for openstackdocstheme < 2.2.0, can be removed once +# pbr stops supporting py27. +repository_name = 'openstack/pbr' bug_project = 'pbr' bug_tag = '' + +# New options with openstackdocstheme >=2.2.0 +openstackdocs_repo_name = 'openstack/pbr' +openstackdocs_auto_name = False +openstackdocs_bug_project = 'pbr' +openstackdocs_bug_tag = '' @@ -10,7 +10,7 @@ home-page = https://docs.openstack.org/pbr/latest/ 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/ + Source Code = https://opendev.org/openstack/pbr python-requires = >=2.6 classifier = Development Status :: 5 - Production/Stable @@ -27,6 +27,7 @@ deps = commands = rm -rf doc/build doc/source/reference/api sphinx-build -W -b html doc/source doc/build/html {posargs} +usedevelop = False [testenv:releasenotes] whitelist_externals = rm |