Imported Upstream version 5.4.1

diff --git a/ChangeLog b/ChangeLog
index 22839a7c80832c3876663fc0d2162a2f9749758c..18bbaaa261ef752cae3a6a103af8c0b110bd68e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 CHANGES
 =======
 
+5.4.1
+-----
+
+
 5.4.0
 -----
 
@@ -9,6 +13,7 @@ CHANGES
 5.3.1
 -----
 
+* Resolve some issue with tox.ini, setup.cfg
 
 5.3.0
 -----

diff --git a/PKG-INFO b/PKG-INFO
index 4a47168fe033ab61f8350c0888183339f321e71c..f9ab6de3337cc5063e39e588cb2aa301baba8f93 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 5.4.0
+Version: 5.4.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack
@@ -65,7 +65,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
 Description-Content-Type: text/x-rst; charset=UTF-8

diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO
index 4a47168fe033ab61f8350c0888183339f321e71c..f9ab6de3337cc5063e39e588cb2aa301baba8f93 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: 5.4.0
+Version: 5.4.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack
@@ -65,7 +65,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
 Description-Content-Type: text/x-rst; charset=UTF-8

diff --git a/setup.cfg b/setup.cfg
index 5a787d88ec742688d4628dbc07ebd3999f3d97ec..077796433d0124064d2139f4a229c4ca5eccf3a0 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,9 +24,9 @@ classifier =
        Programming Language :: Python :: 2
        Programming Language :: Python :: 2.7
        Programming Language :: Python :: 3
-       Programming Language :: Python :: 3.3
-       Programming Language :: Python :: 3.4
        Programming Language :: Python :: 3.5
+       Programming Language :: Python :: 3.6
+       Programming Language :: Python :: 3.7
 
 [files]
 packages = 

diff --git a/tox.ini b/tox.ini
index 5cc32a9adac333e00af5e2e7001dbfd8bea73fe9..7ae6f9e0c392b11e97d68f65e5e383c5c514cc98 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,11 @@
 [tox]
 minversion = 3.1
-envlist = pep8,py{37,36,35,27},docs
+envlist = pep8,py27,py36,py37,docs
 ignore_basepython_conflict = True
-skip_missing_interpreters = True
 
 [testenv]
 usedevelop = True
-install_command = pip install {opts} {packages}
+basepython = python3
 passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS
 setenv =
   OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:1}
@@ -18,11 +17,9 @@ deps =
 commands = stestr run --suppress-attachments {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands = flake8 {posargs}
 
 [testenv:docs]
-basepython = python3
 whitelist_externals = rm
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -32,21 +29,16 @@ commands =
   sphinx-build -W -b html doc/source doc/build/html {posargs}
 
 [testenv:releasenotes]
-basepython = python3
 whitelist_externals = rm
-deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-  -r{toxinidir}/doc/requirements.txt
+deps = {[testenv:docs]deps}
 commands =
   rm -rf releasenotes/build
   sphinx-build -W -b html -d releasenotes/build/doctrees releasenotes/source releasenotes/build/html
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
   PYTHON=coverage run --source pbr --parallel-mode
 commands =
@@ -64,7 +56,6 @@ exclude = .venv,.tox,dist,doc,*.egg,build
 show-source = true
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt