Imported Upstream version 4.0.3

diff --git a/ChangeLog b/ChangeLog
index e93f0a2ce73ae7dab7abc9e1b7a1f27695d44aa0..4e276cdd4473669fd30f571284a90a3975f49ab8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+4.0.3
+-----
+
+* Don't poke in pip for requests
+* Fix builddoc with sphinx <= 1.6
+
 4.0.2
 -----
 

diff --git a/PKG-INFO b/PKG-INFO
index da5c3ce03d2c33754945006896850d924c5a8f91..1f42d38d01172128d08129c8552d4b04f48d1506 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 4.0.2
+Version: 4.0.3
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/RELEASENOTES.rst b/RELEASENOTES.rst
new file mode 100644 (file)
index 0000000..2d48b4f
--- /dev/null
+++ b/RELEASENOTES.rst
@@ -0,0 +1,52 @@
+===
+pbr
+===
+
+.. _pbr_4.0.0:
+
+4.0.0
+=====
+
+.. _pbr_4.0.0_New Features:
+
+New Features
+------------
+
+.. releasenotes/notes/v_version-457b38c8679c5868.yaml @ 4c775e7890e90fc2ea77c66020659e52d6a61414
+
+- Support version parsing of git tag with the ``v<semver>`` pattern
+  (or ``V<semver>``), in addition to ``<semver>``.
+
+
+.. _pbr_4.0.0_Upgrade Notes:
+
+Upgrade Notes
+-------------
+
+.. releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml @ 32c90ba598d7740e52bf21bc5e920fb5df08645a
+
+- Support for entry point command hooks has been removed. This feature was
+  poorly tested, poorly documented, and broken in some environments.
+  Support for global hooks is not affected.
+
+
+.. _pbr_4.0.0_Deprecation Notes:
+
+Deprecation Notes
+-----------------
+
+.. releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml @ 9be181e8e60cc41f3ad685e236b0c4cdc29dbd3c
+
+- Support for ``pyN``-suffixed requirement files has been deprecated:
+  environment markers should be used instead.
+
+.. releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml @ 113685e1b94df9dd2945adbdda757a545b09598c
+
+- *testr* and *nose* integration has been deprecated. This feature allowed
+  *pbr* to dynamically configure the test runner used when running
+  ``setup.py test``. However, this target has fallen out of favour in both
+  the OpenStack and broader Python ecosystem, and both *testr* and *nose*
+  offer native setuptools commands that can be manually aliased to ``test``
+  on a per-project basis, if necessary. This feature will be removed in a
+  future release.
+

diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO
index da5c3ce03d2c33754945006896850d924c5a8f91..1f42d38d01172128d08129c8552d4b04f48d1506 100644 (file)
--- a/pbr.egg-info/PKG-INFO
+++ b/pbr.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 4.0.2
+Version: 4.0.3
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/pbr/builddoc.py b/pbr/builddoc.py
index 167d13e04a5be8ef9a66c2abcb4f0fc4189b9352..4d291fba3764d7abc3619989b1fc91937b40a39f 100644 (file)
--- a/pbr/builddoc.py
+++ b/pbr/builddoc.py
@@ -228,7 +228,7 @@ class LocalBuildDoc(setup_command.BuildDoc):
             return setup_command.BuildDoc.run(self)
 
         # Sphinx < 1.6
-        for builder in self.builder:
+        for builder in self.builders:
             self.builder = builder
             self.finalize_options()
             self._sphinx_run()

diff --git a/releasenotes/notes/reno.cache b/releasenotes/notes/reno.cache
new file mode 100644 (file)
index 0000000..bf6d4ca
--- /dev/null
+++ b/releasenotes/notes/reno.cache
@@ -0,0 +1,47 @@
+---
+file-contents:
+  releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml:
+    deprecations: ['Support for ``pyN``-suffixed requirement files has been deprecated:
+
+        environment markers should be used instead.
+
+        ']
+  releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml:
+    deprecations: ['*testr* and *nose* integration has been deprecated. This feature
+        allowed
+
+        *pbr* to dynamically configure the test runner used when running
+
+        ``setup.py test``. However, this target has fallen out of favour in both
+
+        the OpenStack and broader Python ecosystem, and both *testr* and *nose*
+
+        offer native setuptools commands that can be manually aliased to ``test``
+
+        on a per-project basis, if necessary. This feature will be removed in a
+
+        future release.
+
+        ']
+  releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml:
+    upgrade: ['Support for entry point command hooks has been removed. This feature
+        was
+
+        poorly tested, poorly documented, and broken in some environments.
+
+        Support for global hooks is not affected.
+
+        ']
+  releasenotes/notes/v_version-457b38c8679c5868.yaml:
+    features: ['Support version parsing of git tag with the ``v<semver>`` pattern
+
+        (or ``V<semver>``), in addition to ``<semver>``.
+
+        ']
+notes:
+- files:
+  - [releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml, 9be181e8e60cc41f3ad685e236b0c4cdc29dbd3c]
+  - [releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml, 113685e1b94df9dd2945adbdda757a545b09598c]
+  - [releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml, 32c90ba598d7740e52bf21bc5e920fb5df08645a]
+  - [releasenotes/notes/v_version-457b38c8679c5868.yaml, 4c775e7890e90fc2ea77c66020659e52d6a61414]
+  version: 4.0.0

diff --git a/tools/integration.sh b/tools/integration.sh
index a7111be8c2393009905bf546ec580cbedb546967..2a7e77274560a987d23f7435a0b3c91d17cb64e8 100644 (file)
--- a/tools/integration.sh
+++ b/tools/integration.sh
@@ -14,7 +14,7 @@ function mkvenv {
 
     rm -rf $venv
     virtualenv $venv
-    $venv/bin/pip install $PIPFLAGS -U $PIPVERSION wheel
+    $venv/bin/pip install $PIPFLAGS -U $PIPVERSION wheel requests
 
     # If a change to PBR is being tested, preinstall the wheel for it
     if [ -n "$PBR_CHANGE" ] ; then
@@ -106,11 +106,7 @@ EOF
 cat <<EOF > setup.py
 import setuptools
 
-try:
-    from requests import Timeout
-except ImportError:
-    from pip._vendor.requests import Timeout
-
+from requests import Timeout
 from socket import error as SocketError
 
 # Some environments have network issues that drop connections to pypi