Imported Upstream version 4.1.0

diff --git a/AUTHORS b/AUTHORS
index 4969f00d57c47b5ae3ac16c35fb4f3049f60d797..5fdea423412ecebfa5f9145a7601acd7fd4e4bac 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ Davanum Srinivas <dims@linux.vnet.ibm.com>
 Dave Walker (Daviey) <email@daviey.com>
 David Ripton <dripton@redhat.com>
 David Stanek <dstanek@dstanek.com>
+Dennis Verspuij <dennisverspuij@users.noreply.github.com>
 Devananda van der Veen <devananda.vdv@gmail.com>
 Dirk Mueller <dirk@dmllr.de>
 Doug Hellmann <doug.hellmann@dreamhost.com>
@@ -131,6 +132,7 @@ jiansong <jian.song@easystack.cn>
 lifeless <robertc@robertcollins.net>
 melanie witt <melwitt@yahoo-inc.com>
 nizam <abdul.nizamuddin@nectechnologies.in>
+qingszhao <zhao.daqing@99cloud.net>
 weiweigu <gu.weiwei@zte.com.cn>
 zhangyangyang <zhangyangyang@unionpay.com>
 zhangyanxian <zhang.yanxian@zte.com.cn>

diff --git a/ChangeLog b/ChangeLog
index b3083e5168d83fef52f50a0f82d532588d2f8995..e102726fbe266e7fdbc923cae4db55037ebdb1f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
 CHANGES
 =======
 
+4.1.0
+-----
+
+* Update python3 versions in tox.ini envlist
+* fix tox python3 overrides
+* Support python-requires metadata
+
 4.0.4
 -----
 
 * Revert "Remove win32/nt checks for wrapper script gen"
+* Add leading 0 on alpha release in semver doc
 
 4.0.3
 -----

diff --git a/PKG-INFO b/PKG-INFO
index 612c664da978acb72914e29b829736671c75a8ad..11cd572df02a6b3f98f43edc847cf3718cb0b1f6 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 4.0.4
+Version: 4.1.0
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/RELEASENOTES.rst b/RELEASENOTES.rst
index 2d48b4f86a67b68a3a409163b40f111b7d988921..95afa9cb19f2132a7ce79837ca8509aa2dc86dc3 100644 (file)
--- a/RELEASENOTES.rst
+++ b/RELEASENOTES.rst
@@ -12,7 +12,7 @@ pbr
 New Features
 ------------
 
-.. releasenotes/notes/v_version-457b38c8679c5868.yaml @ 4c775e7890e90fc2ea77c66020659e52d6a61414
+.. releasenotes/notes/v_version-457b38c8679c5868.yaml @ b'4c775e7890e90fc2ea77c66020659e52d6a61414'
 
 - Support version parsing of git tag with the ``v<semver>`` pattern
   (or ``V<semver>``), in addition to ``<semver>``.
@@ -23,7 +23,7 @@ New Features
 Upgrade Notes
 -------------
 
-.. releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml @ 32c90ba598d7740e52bf21bc5e920fb5df08645a
+.. releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml @ b'32c90ba598d7740e52bf21bc5e920fb5df08645a'
 
 - Support for entry point command hooks has been removed. This feature was
   poorly tested, poorly documented, and broken in some environments.
@@ -35,12 +35,12 @@ Upgrade Notes
 Deprecation Notes
 -----------------
 
-.. releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml @ 9be181e8e60cc41f3ad685e236b0c4cdc29dbd3c
+.. releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml @ b'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
+.. releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml @ b'113685e1b94df9dd2945adbdda757a545b09598c'
 
 - *testr* and *nose* integration has been deprecated. This feature allowed
   *pbr* to dynamically configure the test runner used when running

diff --git a/doc/source/user/semver.rst b/doc/source/user/semver.rst
index c5cf5bf4dcc7a07ca0562f076ce50d29714c412e..7d89d85644c2eb3d8aab17ae3248d20ae0e1cad8 100644 (file)
--- a/doc/source/user/semver.rst
+++ b/doc/source/user/semver.rst
@@ -15,8 +15,13 @@ Changes vs SemVer 2.0
    feasible.
 
 #. All versions have been made PEP-440 compatible, because of our deep
-   roots in Python. Pre-release versions are now separated by . not -, and
-   use a/b/c rather than alpha/beta etc.
+   roots in Python:
+
+   - Pre-release versions are now separated by . not -, and use a/b/c
+     rather than alpha/beta etc.
+   - Alpha version are prefixed by a 0 such as: ``2.0.0.0a1`` instead of
+     ``2.0.0.a1`` for version '2.0.0 alpha 1'. Please note dev version tag
+     does not have a leading 0, as is ``2.0.0.0a2.dev1``.
 
 Summary
 -------
@@ -120,7 +125,7 @@ document are to be interpreted as described in `RFC
     version. A pre-release version indicates that
     the version is unstable and might not satisfy the intended
     compatibility requirements as denoted by its associated normal
-    version. Examples: 1.0.0.a1, 1.0.0.b99, 1.0.0.c1000.
+    version. Examples: 1.0.0.0a1, 1.0.0.0b99, 1.0.0.0c1000.
 
 #.  A development version MAY be denoted by appending a dot separated
     identifier immediately following the patch version.
@@ -134,7 +139,7 @@ document are to be interpreted as described in `RFC
     externally facing communication of not-yet-released ideas. Dev versions
     are not public artifacts and should never be placed in public
     repositories: they are intended as developer-local resources. Examples:
-    1.0.0.dev1, 1.0.0.a1.dev1
+    1.0.0.dev1, 1.0.0.0a1.dev1
 
 #.  git version metadata MAY be denoted by appending a dot separated
     identifier immediately following a development or pre-release version.
@@ -142,7 +147,7 @@ document are to be interpreted as described in `RFC
     character git short-sha. The sha MUST NOT be empty. git version
     metadata MUST be ignored when determining version precedence. Thus
     two versions that differ only in the git version, have the same
-    precedence. Example: 1.0.0.a1.g95a9beb.
+    precedence. Example: 1.0.0.0a1.g95a9beb.
 
 #.  Build metadata MAY be denoted by appending a plus sign and a series
     of dot separated identifiers immediately following the patch or
@@ -150,8 +155,8 @@ document are to be interpreted as described in `RFC
     alphanumerics [0-9A-Za-z]. Identifiers MUST NOT be empty. Build
     metadata MUST be ignored when determining version precedence. Thus
     two versions that differ only in the build metadata, have the same
-    precedence. Examples: 1.0.0.a1+001, 1.0.0+20130313144700,
-    1.0.0.b1+exp.sha.5114f85.
+    precedence. Examples: 1.0.0.0a1+001, 1.0.0+20130313144700,
+    1.0.0.0b1+exp.sha.5114f85.
 
 #.  Precedence refers to how versions are compared to each other when
     ordered. Precedence MUST be calculated by separating the version
@@ -162,16 +167,16 @@ document are to be interpreted as described in `RFC
     versions are always compared numerically. Example: 1.0.0 < 2.0.0 <
     2.1.0 < 2.1.1. When major, minor, and patch are equal, a pre-release
     version has lower precedence than a normal version. Example:
-    1.0.0.a1 < 1.0.0. When major, minor, patch and pre-release are equal, a
+    1.0.0.0a1 < 1.0.0. When major, minor, patch and pre-release are equal, a
     development version has a lower precedence than a normal version and of a
     pre-release version. Example: 1.0.0.dev1 < 1.0.0 and 1.0.0.dev9 <
-    1.0.0.a1 and 1.0.0.a1 < 1.0.0.a2.dev4. Precedence for two pre-release
+    1.0.0.0a1 and 1.0.0.0a1 < 1.0.0.0a2.dev4. Precedence for two pre-release
     versions with the same major, minor, and patch version MUST be determined
     by comparing the identifier to the right of the patch version as follows:
     if the alpha portion matches, the numeric portion is compared in
     numerical sort order. If the alpha portion does not match, the sort order
-    is dev < a < b < c. Example: 1.0.0.dev8 < 1.0.0.dev9 < 1.0.0.a1.dev3 <
-    1.0.0.a1 < 1.0.0.b2 < 1.0.0.c1 < 1.0.0.  Precedence for dev versions if
+    is dev < a < b < c. Example: 1.0.0.dev8 < 1.0.0.dev9 < 1.0.0.0a1.dev3 <
+    1.0.0.0a1 < 1.0.0.0b2 < 1.0.0.0c1 < 1.0.0.  Precedence for dev versions if
     all other components are equal is done by comparing their numeric
     component. If all other components are not equal, predence is determined
     by comparing the other components.

diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO
index 612c664da978acb72914e29b829736671c75a8ad..11cd572df02a6b3f98f43edc847cf3718cb0b1f6 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.4
+Version: 4.1.0
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/pbr/util.py b/pbr/util.py
index 31a2a2622989937513e87b0ac997cb661fb6775c..45a3aeddb6d9b1f154cf4a3c8e392b88b8fc00d8 100644 (file)
--- a/pbr/util.py
+++ b/pbr/util.py
@@ -114,6 +114,7 @@ D1_D2_SETUP_ARGS = {
     # broken distutils requires
     "install_requires": ("metadata", "requires_dist"),
     "setup_requires": ("metadata", "setup_requires_dist"),
+    "python_requires": ("metadata",),
     "provides": ("metadata", "provides_dist"),  # **
     "obsoletes": ("metadata", "obsoletes_dist"),  # **
     "package_dir": ("files", 'packages_root'),

diff --git a/releasenotes/notes/reno.cache b/releasenotes/notes/reno.cache
index bf6d4ca1b863ed86786ef3f46011c883b6bb2e8b..05b51f563acc90180820ab023977d954697fd17a 100644 (file)
--- a/releasenotes/notes/reno.cache
+++ b/releasenotes/notes/reno.cache
@@ -40,8 +40,16 @@ file-contents:
         ']
 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]
+  - - releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml
+    - !!binary |
+      OWJlMTgxZThlNjBjYzQxZjNhZDY4NWUyMzZiMGM0Y2RjMjlkYmQzYw==
+  - - releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml
+    - !!binary |
+      MTEzNjg1ZTFiOTRkZjlkZDI5NDVhZGJkZGE3NTdhNTQ1YjA5NTk4Yw==
+  - - releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml
+    - !!binary |
+      MzJjOTBiYTU5OGQ3NzQwZTUyYmYyMWJjNWU5MjBmYjVkZjA4NjQ1YQ==
+  - - releasenotes/notes/v_version-457b38c8679c5868.yaml
+    - !!binary |
+      NGM3NzVlNzg5MGU5MGZjMmVhNzdjNjYwMjA2NTllNTJkNmE2MTQxNA==
   version: 4.0.0

diff --git a/tox.ini b/tox.ini
index 9fc050a4c15054a61c7264fc911a67dfecd33239..4951885e86aeaf1d8600ed09ce9fb4cd7b512d77 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py33,py34,py35,py36,py27,pypy,pep8,docs
+envlist = py35,py36,py27,pypy,pep8,docs
 
 [testenv]
 usedevelop = True
@@ -17,19 +17,24 @@ commands =
 sitepackages = True
 
 [testenv:pep8]
+basepython = python3
 commands = flake8 {posargs}
 
 [testenv:docs]
+basepython = python3
 commands = python setup.py build_sphinx
 
 [testenv:releasenotes]
+basepython = python3
 commands = bash -c {toxinidir}/tools/tox_releasenotes.sh
 
 [testenv:cover]
+basepython = python3
 commands =
   python setup.py test --coverage
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [flake8]