Imported Upstream version 4.1.1

diff --git a/ChangeLog b/ChangeLog
index e102726fbe266e7fdbc923cae4db55037ebdb1f8..b7d66010924c8c234aeb141c8008c5f7c94a55e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+4.1.1
+-----
+
+* trivial: Fix file permissions
+* trivial: Remove 'tools/releasenotes\_tox.sh'
+* Add docstring from LocalManifestMaker.add\_defaults
+
 4.1.0
 -----
 

diff --git a/PKG-INFO b/PKG-INFO
index 11cd572df02a6b3f98f43edc847cf3718cb0b1f6..6442a7f8f7e42d754481037b221b867ee0c63e28 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 4.1.0
+Version: 4.1.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack
 Author-email: openstack-dev@lists.openstack.org
 License: UNKNOWN
-Project-URL: Documentation, https://docs.openstack.org/pbr/
-Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/
 Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/
+Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/
+Project-URL: Documentation, https://docs.openstack.org/pbr/
 Description: Introduction
         ============
         

diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO
index 11cd572df02a6b3f98f43edc847cf3718cb0b1f6..6442a7f8f7e42d754481037b221b867ee0c63e28 100644 (file)
--- a/pbr.egg-info/PKG-INFO
+++ b/pbr.egg-info/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 4.1.0
+Version: 4.1.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack
 Author-email: openstack-dev@lists.openstack.org
 License: UNKNOWN
-Project-URL: Documentation, https://docs.openstack.org/pbr/
-Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/
 Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/
+Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/
+Project-URL: Documentation, https://docs.openstack.org/pbr/
 Description: Introduction
         ============
         

diff --git a/pbr.egg-info/SOURCES.txt b/pbr.egg-info/SOURCES.txt
index e2f9588b485d565f07dca5b881b905366f17c533..619cf061c4fb3620b7f493f4e6f8fa0c283a6e3d 100644 (file)
--- a/pbr.egg-info/SOURCES.txt
+++ b/pbr.egg-info/SOURCES.txt
@@ -94,5 +94,4 @@ releasenotes/notes/v_version-457b38c8679c5868.yaml
 releasenotes/source/conf.py
 releasenotes/source/index.rst
 releasenotes/source/unreleased.rst
-tools/integration.sh
-tools/tox_releasenotes.sh
\ No newline at end of file
+tools/integration.sh
\ No newline at end of file

diff --git a/pbr/packaging.py b/pbr/packaging.py
index 68df2886b65539bba563458ecf2d95dda1600c11..44bfb1ac8a8352dcf616160ba6ba48e9dc269750 100644 (file)
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -488,6 +488,15 @@ class LocalManifestMaker(egg_info.manifest_maker):
             self.filelist.process_template_line(template_line)
 
     def add_defaults(self):
+        """Add all the default files to self.filelist:
+
+        Extends the functionality provided by distutils to also included
+        additional sane defaults, such as the ``AUTHORS`` and ``ChangeLog``
+        files generated by *pbr*.
+
+        Warns if (``README`` or ``README.txt``) or ``setup.py`` are missing;
+        everything else is optional.
+        """
         option_dict = self.distribution.get_option_dict('pbr')
 
         sdist.sdist.add_defaults(self)

diff --git a/pbr/tests/testpackage/setup.py b/pbr/tests/testpackage/setup.py
old mode 100755 (executable)
new mode 100644 (file)
index 8866691..2d9f685
--- a/pbr/tests/testpackage/setup.py
+++ b/pbr/tests/testpackage/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/setup.py b/setup.py
old mode 100755 (executable)
new mode 100644 (file)
index 65c675b..1036c99
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/tools/tox_releasenotes.sh b/tools/tox_releasenotes.sh
deleted file mode 100755 (executable)
index fc64b99..0000000
--- a/tools/tox_releasenotes.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-rm -rf releasenotes/build
-
-sphinx-build -a -E -W \
-    -d releasenotes/build/doctrees \
-    -b html \
-    releasenotes/source releasenotes/build/html
-BUILD_RESULT=$?
-
-UNCOMMITTED_NOTES=$(git status --porcelain | \
-    awk '$1 ~ "M|A|??" && $2 ~ /releasenotes\/notes/ {print $2}')
-
-if [ "${UNCOMMITTED_NOTES}" ]
-then
-    cat <<EOF
-
-REMINDER: The following changes to release notes have not been committed:
-
-${UNCOMMITTED_NOTES}
-
-While that may be intentional, keep in mind that release notes are built from
-committed changes, not the working directory.
-
-EOF
-fi
-
-exit ${BUILD_RESULT}

diff --git a/tox.ini b/tox.ini
index 4951885e86aeaf1d8600ed09ce9fb4cd7b512d77..43410077bde7da1aa57358a095e4b0a0918c864f 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ envlist = py35,py36,py27,pypy,pep8,docs
 
 [testenv]
 usedevelop = True
-whitelist_externals = bash
 install_command = pip install {opts} {packages}
 passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE
 deps =
@@ -26,7 +25,9 @@ commands = python setup.py build_sphinx
 
 [testenv:releasenotes]
 basepython = python3
-commands = bash -c {toxinidir}/tools/tox_releasenotes.sh
+commands =
+  rm -rf releasenotes/build
+  sphinx-build -W -b html -d releasenotes/build/doctrees releasenotes/source releasenotes/build/html
 
 [testenv:cover]
 basepython = python3