Hello community,
here is the log from the commit of package python-pbr for openSUSE:Factory
checked in at 2014-03-19 08:03:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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.changes 2014-01-23
15:54:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr.changes
2014-03-19 08:03:09.000000000 +0100
@@ -1,0 +2,19 @@
+Tue Mar 18 14:18:44 UTC 2014 - speili...@suse.com
+
+- Update to version pbr-0.6.14.g6ffff7c:
+ * Factor run_cmd out of the base class
+ * Return the real class in VersionInfo __repr__
+ * Fix up some docstrings
+ * Init sphinx config values before accessing them
+ * Remove copyright from empty files
+ * Declare support for Python versions in setup.cfg
+ * Updated from global requirements
+ * Remove unused _parse_mailmap()
+ * Add support for python 3-<3.3
+ * Remove tox locale overrides
+ * Do not force log verbosity level to info
+ 0.6
+ * package: read a specific Python version requirement file
+- Fix dependencies
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pbr.spec ++++++
--- /var/tmp/diff_new_pack.PzRyVi/_old 2014-03-19 08:03:09.000000000 +0100
+++ /var/tmp/diff_new_pack.PzRyVi/_new 2014-03-19 08:03:09.000000000 +0100
@@ -21,7 +21,7 @@
%bcond_with test
Name: python-pbr
-Version: 0.5.23.36.g00fbbd1
+Version: 0.6.14.g6ffff7c
Release: 0
Summary: Python Build Reasonableness
License: Apache-2.0
@@ -37,17 +37,15 @@
%if 0%{?suse_version} <= 1110
BuildRequires: python-discover
%endif
-BuildRequires: python-fixtures >= 0.3.12
-BuildRequires: python-flake8 >= 2.0
-#BuildRequires: python-pip >= 1.0
-#BuildRequires: python-python-mimeparse
-BuildRequires: python-python-subunit
+BuildRequires: python-fixtures >= 0.3.14
+BuildRequires: python-mock >= 1.0
+BuildRequires: python-python-subunit >= 0.0.18
BuildRequires: python-testrepository >= 0.0.17
-BuildRequires: python-testresources
+BuildRequires: python-testresources >= 0.2.4
BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 0.9.32
+BuildRequires: python-testtools >= 0.9.34
%endif
-Requires: python-pip >= 1.0
+Requires: python-pip >= 1.4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -76,12 +74,13 @@
%if %{with test}
%check
-python setup.py testr
+testr init && testr run
%endif
%files
%defattr(-,root,root,-)
%doc README.rst AUTHORS LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/pbr
+%{python_sitelib}/pbr-%{version}-py%{py_ver}.egg-info
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.PzRyVi/_old 2014-03-19 08:03:09.000000000 +0100
+++ /var/tmp/diff_new_pack.PzRyVi/_new 2014-03-19 08:03:09.000000000 +0100
@@ -1,10 +1,12 @@
<services>
- <service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/pbr/pbr-master.tar.gz</param>
- <param name="email">opensuse-cl...@opensuse.org</param>
- <param name="plain-version">True</param>
+ <service mode="disabled" name="download_files">
+ <param name="changesgenerate">enable</param>
+ </service>
+ <service mode="disabled" name="set_version">
+ <param name="basename">pbr</param>
+ </service>
+ <service mode="disabled" name="python_requires">
</service>
-
<service name="refresh_patches" mode="disabled">
<param name="changesgenerate">enable</param>
</service>
++++++ pbr-master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/ChangeLog
new/pbr-0.6.14.g6ffff7c/ChangeLog
--- old/pbr-0.5.23.36.g00fbbd1/ChangeLog 2013-12-14 16:04:55.000000000
+0100
+++ new/pbr-0.6.14.g6ffff7c/ChangeLog 2014-03-17 21:51:56.000000000 +0100
@@ -1,6 +1,22 @@
CHANGES
=======
+* Factor run_cmd out of the base class
+* Return the real class in VersionInfo __repr__
+* Fix up some docstrings
+* Init sphinx config values before accessing them
+* Remove copyright from empty files
+* Declare support for Python versions in setup.cfg
+* Updated from global requirements
+* Remove unused _parse_mailmap()
+* Add support for python 3-<3.3
+* Remove tox locale overrides
+* Do not force log verbosity level to info
+
+0.6
+---
+
+* package: read a specific Python version requirement file
* Fix typos in documents
* Pin sphinx to <1.2
* Build mirror using proper requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/PKG-INFO
new/pbr-0.6.14.g6ffff7c/PKG-INFO
--- old/pbr-0.5.23.36.g00fbbd1/PKG-INFO 2013-12-14 16:04:55.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/PKG-INFO 2014-03-17 21:51:57.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pbr
-Version: 0.5.23.36.g00fbbd1
+Version: 0.6.14.g6ffff7c
Summary: Python Build Reasonableness
Home-page: http://pypi.python.org/pypi/pbr
Author: OpenStack
@@ -68,3 +68,8 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/doc/source/index.rst
new/pbr-0.6.14.g6ffff7c/doc/source/index.rst
--- old/pbr-0.5.23.36.g00fbbd1/doc/source/index.rst 2013-12-14
16:04:32.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/doc/source/index.rst 2014-03-17
21:51:40.000000000 +0100
@@ -67,6 +67,21 @@
them into the install_requires and/or tests_require and/or dependency_links
arguments to setup. Voila!
+You can also have a requirement file for each specific major version of
+Python. If you want to have a different package list for Python 3, just drop
+a requirements-py3.txt, and it will be used instead.
+
+The requirement files are tried in that order (N being the Python major
+version number used to install the package):
+
+* requirements-pyN.txt
+* tools/pip-requires-py3
+* requirements.txt
+* tools/pip-requires
+
+Only the first file found is used to install the list of packages it
+contains.
+
long_description
----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr/__init__.py
new/pbr-0.6.14.g6ffff7c/pbr/__init__.py
--- old/pbr-0.5.23.36.g00fbbd1/pbr/__init__.py 2013-12-14 16:04:32.000000000
+0100
+++ new/pbr-0.6.14.g6ffff7c/pbr/__init__.py 2014-03-17 21:51:40.000000000
+0100
@@ -1,14 +0,0 @@
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr/packaging.py
new/pbr-0.6.14.g6ffff7c/pbr/packaging.py
--- old/pbr-0.5.23.36.g00fbbd1/pbr/packaging.py 2013-12-14 16:04:32.000000000
+0100
+++ new/pbr-0.6.14.g6ffff7c/pbr/packaging.py 2014-03-17 21:51:40.000000000
+0100
@@ -20,6 +20,8 @@
Utilities with minimum-depends for use in setup.py
"""
+from __future__ import unicode_literals
+
import email
import io
import os
@@ -44,7 +46,6 @@
from pbr import extra_files
-log.set_verbosity(log.INFO)
TRUE_VALUES = ('true', '1', 'yes')
REQUIREMENTS_FILES = ('requirements.txt', 'tools/pip-requires')
TEST_REQUIREMENTS_FILES = ('test-requirements.txt', 'tools/test-requires')
@@ -57,7 +58,13 @@
files = os.environ.get("PBR_REQUIREMENTS_FILES")
if files:
return tuple(f.strip() for f in files.split(','))
- return REQUIREMENTS_FILES
+ # Returns a list composed of:
+ # - REQUIREMENTS_FILES with -py2 or -py3 in the name
+ # (e.g. requirements-py3.txt)
+ # - REQUIREMENTS_FILES
+ return (list(map(('-py' + str(sys.version_info[0])).join,
+ map(os.path.splitext, REQUIREMENTS_FILES)))
+ + list(REQUIREMENTS_FILES))
def append_text_list(config, key, text_list):
@@ -70,18 +77,6 @@
config[key] = '\n'.join(new_value)
-def _parse_mailmap(mailmap_info):
- mapping = dict()
- for l in mailmap_info:
- try:
- canonical_email, alias = re.match(
- r'[^#]*?(<.+>).*(<.+>).*', l).groups()
- except AttributeError:
- continue
- mapping[alias] = canonical_email
- return mapping
-
-
def _pip_install(links, requires, root=None, option_dict=dict()):
if get_boolean_option(
option_dict, 'skip_pip_install', 'SKIP_PIP_INSTALL'):
@@ -264,7 +259,7 @@
first_line = True
with io.open(new_changelog, "w",
encoding="utf-8") as changelog_file:
- changelog_file.write(u"CHANGES\n=======\n\n")
+ changelog_file.write("CHANGES\n=======\n\n")
for line in changelog.split('\n'):
line_parts = line.split()
if len(line_parts) < 2:
@@ -287,7 +282,7 @@
if not first_line:
changelog_file.write(u'\n')
changelog_file.write(
- (u"%(tag)s\n%(underline)s\n\n" %
+ ("%(tag)s\n%(underline)s\n\n" %
dict(tag=tag,
underline=underline)))
@@ -295,7 +290,7 @@
if msg.endswith("."):
msg = msg[:-1]
changelog_file.write(
- (u"* %(msg)s\n" % dict(msg=msg)))
+ ("* %(msg)s\n" % dict(msg=msg)))
first_line = False
@@ -699,6 +694,7 @@
if self.today:
confoverrides['today'] = self.today
sphinx_config = config.Config(self.config_dir, 'conf.py', {}, [])
+ sphinx_config.init_values()
if self.builder == 'man' and len(sphinx_config.man_pages) == 0:
return
app = application.Sphinx(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr/tests/base.py
new/pbr-0.6.14.g6ffff7c/pbr/tests/base.py
--- old/pbr-0.5.23.36.g00fbbd1/pbr/tests/base.py 2013-12-14
16:04:32.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/pbr/tests/base.py 2014-03-17 21:51:40.000000000
+0100
@@ -122,12 +122,19 @@
working copy--returns the stdout and stderr streams and the exit code
from the subprocess.
"""
+ return _run_cmd([cmd] + list(args), cwd=self.package_dir)
- os.chdir(self.package_dir)
- p = subprocess.Popen([cmd] + list(args), stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- streams = tuple(s.decode('latin1').strip() for s in p.communicate())
- for line in streams:
- print(line)
- return (streams) + (p.returncode,)
+def _run_cmd(args, cwd):
+ """Run the command args in cwd.
+
+ :param args: The command to run e.g. ['git', 'status']
+ :param cwd: The directory to run the comamnd in.
+ :return: ((stdout, stderr), returncode)
+ """
+ p = subprocess.Popen(
+ args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd)
+ streams = tuple(s.decode('latin1').strip() for s in p.communicate())
+ for content in streams:
+ print(content)
+ return (streams) + (p.returncode,)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr/tests/test_setup.py
new/pbr-0.6.14.g6ffff7c/pbr/tests/test_setup.py
--- old/pbr-0.5.23.36.g00fbbd1/pbr/tests/test_setup.py 2013-12-14
16:04:32.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/pbr/tests/test_setup.py 2014-03-17
21:51:40.000000000 +0100
@@ -352,6 +352,22 @@
self.assertEqual(['foobar', 'foobaz'],
packaging.parse_requirements([self.tmp_file]))
+ def test_parse_requirements_python_version(self):
+ with open("requirements-py%d.txt" % sys.version_info[0],
+ "w") as fh:
+ fh.write("# this is a comment\nfoobar\n# and another one\nfoobaz")
+ self.assertEqual(['foobar', 'foobaz'],
+ packaging.parse_requirements())
+
+ def test_parse_requirements_right_python_version(self):
+ with open("requirements-py1.txt", "w") as fh:
+ fh.write("thisisatrap")
+ with open("requirements-py%d.txt" % sys.version_info[0],
+ "w") as fh:
+ fh.write("# this is a comment\nfoobar\n# and another one\nfoobaz")
+ self.assertEqual(['foobar', 'foobaz'],
+ packaging.parse_requirements())
+
class ParseDependencyLinksTest(base.BaseTestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr/util.py
new/pbr-0.6.14.g6ffff7c/pbr/util.py
--- old/pbr-0.5.23.36.g00fbbd1/pbr/util.py 2013-12-14 16:04:32.000000000
+0100
+++ new/pbr-0.6.14.g6ffff7c/pbr/util.py 2014-03-17 21:51:40.000000000 +0100
@@ -150,9 +150,6 @@
CSV_FIELDS = ("keywords",)
-log.set_verbosity(log.INFO)
-
-
def resolve_name(name):
"""Resolve a name like ``module.object`` to an object and return it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr/version.py
new/pbr-0.6.14.g6ffff7c/pbr/version.py
--- old/pbr-0.5.23.36.g00fbbd1/pbr/version.py 2013-12-14 16:04:32.000000000
+0100
+++ new/pbr-0.6.14.g6ffff7c/pbr/version.py 2014-03-17 21:51:40.000000000
+0100
@@ -25,6 +25,7 @@
def __init__(self, package):
"""Object that understands versioning for a package
+
:param package: name of the python package, such as glance, or
python-glanceclient
"""
@@ -39,11 +40,15 @@
def __repr__(self):
"""Include the name."""
- return "VersionInfo(%s:%s)" % (self.package, self.version_string())
+ return "pbr.version.VersionInfo(%s:%s)" % (
+ self.package, self.version_string())
def _get_version_from_pkg_resources(self):
- """Get the version of the package from the pkg_resources record
- associated with the package.
+ """Obtain a version from pkg_resources or setup-time logic if missing.
+
+ This will try to get the version of the package from the pkg_resources
+ record associated with the package, and if there is no such record
+ falls back to the logic sdist would use.
"""
try:
requirement = pkg_resources.Requirement.parse(self.package)
@@ -57,8 +62,9 @@
return packaging.get_version(self.package)
def release_string(self):
- """Return the full version of the package including suffixes indicating
- VCS status.
+ """Return the full version of the package.
+
+ This including suffixes indicating VCS status.
"""
if self.release is None:
self.release = self._get_version_from_pkg_resources()
@@ -83,11 +89,11 @@
version_string_with_vcs = release_string
def cached_version_string(self, prefix=""):
- """Generate an object which will expand in a string context to
- the results of version_string(). We do this so that don't
- call into pkg_resources every time we start up a program when
- passing version information into the CONF constructor, but
- rather only do the calculation when and if a version is requested
+ """Return a cached version string.
+
+ This will return a cached version string if one is already cached,
+ irrespective of prefix. If none is cached, one will be created with
+ prefix and then cached and returned.
"""
if not self._cached_version:
self._cached_version = "%s%s" % (prefix,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr.egg-info/PKG-INFO
new/pbr-0.6.14.g6ffff7c/pbr.egg-info/PKG-INFO
--- old/pbr-0.5.23.36.g00fbbd1/pbr.egg-info/PKG-INFO 2013-12-14
16:04:55.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/pbr.egg-info/PKG-INFO 2014-03-17
21:51:57.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pbr
-Version: 0.5.23.36.g00fbbd1
+Version: 0.6.14.g6ffff7c
Summary: Python Build Reasonableness
Home-page: http://pypi.python.org/pypi/pbr
Author: OpenStack
@@ -68,3 +68,8 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/pbr.egg-info/requires.txt
new/pbr-0.6.14.g6ffff7c/pbr.egg-info/requires.txt
--- old/pbr-0.5.23.36.g00fbbd1/pbr.egg-info/requires.txt 2013-12-14
16:04:55.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/pbr.egg-info/requires.txt 2014-03-17
21:51:57.000000000 +0100
@@ -1 +1 @@
-pip>=1.0
\ No newline at end of file
+pip>=1.4
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/requirements.txt
new/pbr-0.6.14.g6ffff7c/requirements.txt
--- old/pbr-0.5.23.36.g00fbbd1/requirements.txt 2013-12-14 16:04:32.000000000
+0100
+++ new/pbr-0.6.14.g6ffff7c/requirements.txt 2014-03-17 21:51:40.000000000
+0100
@@ -1 +1 @@
-pip>=1.0
+pip>=1.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/setup.cfg
new/pbr-0.6.14.g6ffff7c/setup.cfg
--- old/pbr-0.5.23.36.g00fbbd1/setup.cfg 2013-12-14 16:04:55.000000000
+0100
+++ new/pbr-0.6.14.g6ffff7c/setup.cfg 2014-03-17 21:51:57.000000000 +0100
@@ -16,6 +16,11 @@
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
Programming Language :: Python
+ Programming Language :: Python :: 2
+ Programming Language :: Python :: 2.6
+ Programming Language :: Python :: 2.7
+ Programming Language :: Python :: 3
+ Programming Language :: Python :: 3.3
[files]
packages =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/test-requirements.txt
new/pbr-0.6.14.g6ffff7c/test-requirements.txt
--- old/pbr-0.5.23.36.g00fbbd1/test-requirements.txt 2013-12-14
16:04:32.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/test-requirements.txt 2014-03-17
21:51:40.000000000 +0100
@@ -1,11 +1,11 @@
coverage>=3.6
discover
-fixtures>=0.3.12
+fixtures>=0.3.14
flake8==2.0
mock>=1.0
-python-subunit
+python-subunit>=0.0.18
sphinx>=1.1.2,<1.2
-testrepository>=0.0.17
-testresources<0.3
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
+testrepository>=0.0.18
+testresources>=0.2.4
+testscenarios>=0.4
+testtools>=0.9.34
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pbr-0.5.23.36.g00fbbd1/tox.ini
new/pbr-0.6.14.g6ffff7c/tox.ini
--- old/pbr-0.5.23.36.g00fbbd1/tox.ini 2013-12-14 16:04:32.000000000 +0100
+++ new/pbr-0.6.14.g6ffff7c/tox.ini 2014-03-17 21:51:40.000000000 +0100
@@ -7,9 +7,6 @@
usedevelop = True
install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
- LANG=en_US.UTF-8
- LANGUAGE=en_US:en
- LC_ALL=C
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
