Hello community,
here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2015-10-01 12:20:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pbr (Old)
and /work/SRC/openSUSE:Factory/.python-pbr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pbr"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pbr/python-pbr-doc.changes 2015-09-16 10:36:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr-doc.changes 2015-10-01 12:20:44.000000000 +0200
@@ -1,0 +2,9 @@
+Sun Sep 20 09:03:29 UTC 2015 - tbechtold@suse.com
+
+- update to 1.8.0:
+ * Strip comments present in setup.cfg
+ * Protect WSGI application with a critical section
+- Remove 0001-Remove-sphinx_config.init_values-manual-call.patch
+ Fixed upstream
+
+-------------------------------------------------------------------
python-pbr.changes: same change
Old:
----
0001-Remove-sphinx_config.init_values-manual-call.patch
pbr-1.7.0.tar.gz
New:
----
pbr-1.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pbr-doc.spec ++++++
--- /var/tmp/diff_new_pack.e39tmU/_old 2015-10-01 12:20:45.000000000 +0200
+++ /var/tmp/diff_new_pack.e39tmU/_new 2015-10-01 12:20:45.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-pbr-doc
-Version: 1.7.0
+Version: 1.8.0
Release: 0
Summary: Documentation for python-pbr
License: Apache-2.0
@@ -25,9 +25,6 @@
Url: http://pypi.python.org/pypi/pbr
Source: https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz
Source1: python-pbr-rpmlintrc
-# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/
-# needed to be abe to use pbr with newer Sphinx versions
-Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch
BuildRequires: fdupes
BuildRequires: python-devel
# Documentation requirements:
@@ -44,7 +41,6 @@
%prep
%setup -q -n pbr-%{version}
-%patch0 -p1
# Get rid of ugly build-time deps that require network:
sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
++++++ python-pbr.spec ++++++
--- /var/tmp/diff_new_pack.e39tmU/_old 2015-10-01 12:20:45.000000000 +0200
+++ /var/tmp/diff_new_pack.e39tmU/_new 2015-10-01 12:20:45.000000000 +0200
@@ -21,7 +21,7 @@
%bcond_with test
Name: python-pbr
-Version: 1.7.0
+Version: 1.8.0
Release: 0
Summary: Python Build Reasonableness
License: Apache-2.0
@@ -29,9 +29,6 @@
Url: http://pypi.python.org/pypi/pbr
Source: https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz
Source1: python-pbr-rpmlintrc
-# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/
-# needed to be abe to use pbr with newer Sphinx versions
-Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch
BuildRequires: fdupes
BuildRequires: python-devel
BuildRequires: python-pip >= 1.4
@@ -69,7 +66,6 @@
%prep
%setup -q -n pbr-%{version}
-%patch0 -p1
# Get rid of ugly build-time deps that require network:
sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
++++++ pbr-1.7.0.tar.gz -> pbr-1.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/AUTHORS new/pbr-1.8.0/AUTHORS
--- old/pbr-1.7.0/AUTHORS 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/AUTHORS 2015-09-14 22:59:19.000000000 +0200
@@ -1,5 +1,6 @@
Akihiro Motoki
Alex Gaynor
+Alexander Makarov
Andreas Jaeger
Andrew Bogott
Angus Salkeld
@@ -87,6 +88,7 @@
Thomas Grainger
Thomas Leaman
Tim Simpson
+Timothy Chavez
Toilal
Vasudev Kamath
Vincent Untz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/ChangeLog new/pbr-1.8.0/ChangeLog
--- old/pbr-1.7.0/ChangeLog 2015-09-08 18:21:16.000000000 +0200
+++ new/pbr-1.8.0/ChangeLog 2015-09-14 22:59:19.000000000 +0200
@@ -1,6 +1,12 @@
CHANGES
=======
+1.8.0
+-----
+
+* Strip comments present in setup.cfg
+* Protect WSGI application with a critical section
+
1.7.0
-----
@@ -10,6 +16,7 @@
-----
* Strip comments in requirements files
+* Support Sphinx >=1.3 new protoype and warnings
1.5.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/PKG-INFO new/pbr-1.8.0/PKG-INFO
--- old/pbr-1.7.0/PKG-INFO 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/PKG-INFO 2015-09-14 22:59:19.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pbr
-Version: 1.7.0
+Version: 1.8.0
Summary: Python Build Reasonableness
Home-page: https://launchpad.net/pbr
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/builddoc.py new/pbr-1.8.0/pbr/builddoc.py
--- old/pbr-1.7.0/pbr/builddoc.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/builddoc.py 2015-09-14 22:58:58.000000000 +0200
@@ -17,7 +17,9 @@
from distutils import log
import fnmatch
import os
+import pkg_resources
import sys
+import warnings
try:
import cStringIO
@@ -130,14 +132,19 @@
if self.today:
confoverrides['today'] = self.today
sphinx_config = config.Config(self.config_dir, 'conf.py', {}, [])
- sphinx_config.init_values()
+ sphinx_ver = pkg_resources.get_distribution("sphinx").version
+ if pkg_resources.parse_version(sphinx_ver) >= \
+ pkg_resources.parse_version('1.3.1'):
+ sphinx_config.init_values(warnings.warn)
+ else:
+ sphinx_config.init_values()
if self.builder == 'man' and len(sphinx_config.man_pages) == 0:
return
app = application.Sphinx(
self.source_dir, self.config_dir,
self.builder_target_dir, self.doctree_dir,
self.builder, confoverrides, status_stream,
- freshenv=self.fresh_env, warningiserror=True)
+ freshenv=self.fresh_env, warningiserror=False)
try:
app.build(force_all=self.all_files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/packaging.py new/pbr-1.8.0/pbr/packaging.py
--- old/pbr-1.7.0/pbr/packaging.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/packaging.py 2015-09-14 22:58:58.000000000 +0200
@@ -250,6 +250,8 @@
_wsgi_text = """#PBR Generated from %(group)r
+import threading
+
from %(module_name)s import %(import_target)s
if __name__ == "__main__":
@@ -275,7 +277,12 @@
server.serve_forever()
else:
- application = %(invoke_target)s()
+ application = None
+ app_lock = threading.Lock()
+
+ with app_lock:
+ if application is None:
+ application = %(invoke_target)s()
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/tests/test_packaging.py new/pbr-1.8.0/pbr/tests/test_packaging.py
--- old/pbr-1.7.0/pbr/tests/test_packaging.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/tests/test_packaging.py 2015-09-14 22:58:58.000000000 +0200
@@ -479,7 +479,8 @@
[extras]
test =
foo
- baz>3.2 :python_version=='2.7'
+ baz>3.2 :python_version=='2.7' # MIT
+ bar>3.3 :python_version=='2.7' # MIT # Apache
""")))
# pkg_resources.split_sections uses None as the title of an
# anonymous section instead of the empty string. Weird.
@@ -489,7 +490,7 @@
":(python_version=='2.7')": ['Routes>=1.12.3,!=2.0,!=2.1',
'requests-kerberos>=0.6'],
'test': ['foo'],
- "test:(python_version=='2.7')": ['baz>3.2']
+ "test:(python_version=='2.7')": ['baz>3.2', 'bar>3.3']
}
setup_py = os.path.join(tempdir, 'setup.py')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/tests/test_wsgi.py new/pbr-1.8.0/pbr/tests/test_wsgi.py
--- old/pbr-1.7.0/pbr/tests/test_wsgi.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/tests/test_wsgi.py 2015-09-14 22:58:58.000000000 +0200
@@ -164,7 +164,7 @@
"%s" % app_name)
else_block = """else:
- application = %s()""" % app_name
+ application = None"""
self.assertIn(main_block, script_txt)
self.assertIn(starting_block, script_txt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/util.py new/pbr-1.8.0/pbr/util.py
--- old/pbr-1.7.0/pbr/util.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/util.py 2015-09-14 22:58:58.000000000 +0200
@@ -334,7 +334,7 @@
# Split install_requires into package,env_marker tuples
# These will be re-assembled later
install_requires = []
- requirement_pattern = '(?P<package>[^;]*);?(?P.*)$'
+ requirement_pattern = '(?P<package>[^;]*);?(?P[^#]*?)(?:\s*#.*)?$'
for requirement in in_cfg_value:
m = re.match(requirement_pattern, requirement)
requirement_package = m.group('package').strip()
@@ -394,7 +394,7 @@
# -> {'fred': ['bar'], 'fred:marker':['foo']}
if 'extras' in config:
- requirement_pattern = '(?P<package>[^:]*):?(?P.*)$'
+ requirement_pattern = '(?P<package>[^:]*):?(?P[^#]*?)(?:\s*#.*)?$'
extras = config['extras']
for extra in extras:
extra_requirements = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr.egg-info/PKG-INFO new/pbr-1.8.0/pbr.egg-info/PKG-INFO
--- old/pbr-1.7.0/pbr.egg-info/PKG-INFO 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/pbr.egg-info/PKG-INFO 2015-09-14 22:59:19.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pbr
-Version: 1.7.0
+Version: 1.8.0
Summary: Python Build Reasonableness
Home-page: https://launchpad.net/pbr
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/setup.cfg new/pbr-1.8.0/setup.cfg
--- old/pbr-1.7.0/setup.cfg 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/setup.cfg 2015-09-14 22:59:19.000000000 +0200
@@ -53,7 +53,7 @@
universal = 1
[egg_info]
+tag_build =
tag_date = 0
tag_svn_revision = 0
-tag_build =