Hello community,
here is the log from the commit of package python-versiontools for
openSUSE:Factory checked in at 2012-02-17 12:10:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-versiontools (Old)
and /work/SRC/openSUSE:Factory/.python-versiontools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-versiontools", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-versiontools/python-versiontools.changes
2011-09-26 10:18:15.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-versiontools.new/python-versiontools.changes
2012-02-17 12:10:13.000000000 +0100
@@ -1,0 +2,27 @@
+Wed Feb 1 13:24:11 UTC 2012 - [email protected]
+
+- Simplified macro usage
+
+-------------------------------------------------------------------
+Tue Jan 24 21:37:26 UTC 2012 - [email protected]
+
+- Update to 1.8.3:
+ * Fix incorrectly specified line in git support. Previosuly a KeyError
+ may bleed to the outside calling code, depending on python version.
+ * Fix incorrectly specified line in bzr support. Previously a non-bzr
+ directory could be associated as a malformed bzr branch.
+
+-------------------------------------------------------------------
+Thu Jan 12 01:53:00 UTC 2012 - [email protected]
+
+- Update to 1.8.2:
+ * Improve git support by adding code paths compatible with python-git 0.1.6
+ (which is easier to get on Debian)
+ * Change git support to default to short commit id. If you want to access the
+ long commit id you need to access it directly as GitIntegration.commit_id
+- Version 1.8.1
+ * Improve performance when working with checkouts. The use of branch.nick has
+ been replaced with branch._get_nick(local=True). This avoids network
+ operations and is much more responsive.
+
+-------------------------------------------------------------------
Old:
----
versiontools-1.8.tar.gz
New:
----
versiontools-1.8.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-versiontools.spec ++++++
--- /var/tmp/diff_new_pack.1tPSdx/_old 2012-02-17 12:10:14.000000000 +0100
+++ /var/tmp/diff_new_pack.1tPSdx/_new 2012-02-17 12:10:14.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-versiontools
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -11,12 +11,12 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: python-versiontools
-Version: 1.8
+Version: 1.8.3
Release: 0
Url: https://launchpad.net/versiontools
Summary: Smart replacement for plain tuple used in __version__
@@ -27,13 +27,11 @@
BuildRequires: python-devel
BuildRequires: python-distribute
Requires: python-distribute
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
+%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()")}
+%else
BuildArch: noarch
%endif
-%endif
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%description
Smart replacement for plain tuple used in __version__.
++++++ versiontools-1.8.tar.gz -> versiontools-1.8.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/PKG-INFO
new/versiontools-1.8.3/PKG-INFO
--- old/versiontools-1.8/PKG-INFO 2011-09-14 18:15:02.000000000 +0200
+++ new/versiontools-1.8.3/PKG-INFO 2012-01-24 14:32:21.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: versiontools
-Version: 1.8
+Version: 1.8.3
Summary: Smart replacement for plain tuple used in __version__
Home-page: https://launchpad.net/versiontools
Author: Zygmunt Krynicki
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/doc/changes.rst
new/versiontools-1.8.3/doc/changes.rst
--- old/versiontools-1.8/doc/changes.rst 2011-09-14 18:11:42.000000000
+0200
+++ new/versiontools-1.8.3/doc/changes.rst 2012-01-24 14:30:24.000000000
+0100
@@ -1,6 +1,36 @@
Version History
***************
+.. _version_1_8_3:
+
+Version 1.8.3
+=============
+
+* Fix incorrectly specified line in git support. Previosuly a KeyError
+ may bleed to the outside calling code, depending on python version.
+
+* Fix incorrectly specified line in bzr support. Previously a non-bzr
+ directory could be associated as a malformed bzr branch.
+
+.. _version_1_8_2:
+
+Version 1.8.2
+=============
+
+ * Improve git support by adding code paths compatible with python-git 0.1.6
(which
+ is easier to get on Debian)
+ * Change git support to default to short commit id. If you want to access the
+ long commit id you need to access it directly as GitIntegration.commit_id
+
+.. _version_1_8_1:
+
+Version 1.8.1
+=============
+
+ * Improve performance when working with checkouts. The use of branch.nick has
+ been replaced with branch._get_nick(local=True). This avoids network
+ operations and is much more responsive.
+
.. _version_1_8:
Version 1.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/doc/index.rst
new/versiontools-1.8.3/doc/index.rst
--- old/versiontools-1.8/doc/index.rst 2011-09-14 18:12:11.000000000 +0200
+++ new/versiontools-1.8.3/doc/index.rst 2012-01-24 14:30:34.000000000
+0100
@@ -5,7 +5,7 @@
.. automodule:: versiontools
.. seealso:: To get started quickly see :ref:`usage`
-.. seealso:: See what's new in :ref:`version_1_8`
+.. seealso:: See what's new in :ref:`version_1_8_3`
.. note::
This document may be out of date, the bleeding edge version is always
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/doc/vcs-integration.rst
new/versiontools-1.8.3/doc/vcs-integration.rst
--- old/versiontools-1.8/doc/vcs-integration.rst 2011-08-30
16:30:45.000000000 +0200
+++ new/versiontools-1.8.3/doc/vcs-integration.rst 2011-12-09
23:37:28.000000000 +0100
@@ -74,9 +74,8 @@
+++
To work with Git repositories you will need `GitPython
-<http://pypi.python.org/pypi/GitPython>`_. A version supplied with Ubuntu Natty
-is not recent enough so I would suggest using a more recent version directly
-form the python package index.
+<http://pypi.python.org/pypi/GitPython>`_. Version 0.1.6 is sufficient to run
+the code.
Mercurial
+++++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/versiontools/__init__.py
new/versiontools-1.8.3/versiontools/__init__.py
--- old/versiontools-1.8/versiontools/__init__.py 2011-09-14
18:14:01.000000000 +0200
+++ new/versiontools-1.8.3/versiontools/__init__.py 2012-01-24
14:30:43.000000000 +0100
@@ -27,7 +27,7 @@
"""
-__version__ = (1, 8, 0, "final", 0)
+__version__ = (1, 8, 3, "final", 0)
import inspect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/versiontools/bzr_support.py
new/versiontools-1.8.3/versiontools/bzr_support.py
--- old/versiontools-1.8/versiontools/bzr_support.py 2011-09-14
18:05:34.000000000 +0200
+++ new/versiontools-1.8.3/versiontools/bzr_support.py 2012-01-24
14:26:56.000000000 +0100
@@ -31,7 +31,7 @@
"""
def __init__(self, branch):
self._revno = branch.last_revision_info()[0]
- self._branch_nick = branch.nick
+ self._branch_nick = branch._get_nick(local=True)
@property
def revno(self):
@@ -65,13 +65,13 @@
library_state = bzrlib.initialize()
library_state.__enter__()
try:
- from bzrlib import branch
- branch = branch.Branch.open_containing(source_tree)[0]
+ from bzrlib.branch import Branch
+ branch = Branch.open_containing(source_tree)[0]
finally:
library_state.__exit__(None, None, None)
else:
- from bzrlib import branch
- branch = branch.Branch.open_containing(source_tree)[0]
+ from bzrlib.branch import Branch
+ branch = Branch.open_containing(source_tree)[0]
except Exception:
from versiontools import get_exception_message
message = get_exception_message(*sys.exc_info())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/versiontools/git_support.py
new/versiontools-1.8.3/versiontools/git_support.py
--- old/versiontools-1.8/versiontools/git_support.py 2011-08-30
13:41:42.000000000 +0200
+++ new/versiontools-1.8.3/versiontools/git_support.py 2011-12-22
18:14:09.000000000 +0100
@@ -31,18 +31,44 @@
Git integration for versiontools
"""
def __init__(self, repo):
- self._revno = str(repo.head.commit)
+ head = None
try:
- self._branch_nick = str(repo.head.reference.name)
- except Exception:
- self._branch_nick = None
+ # This path is for 0.3RC from pypi
+ head = repo.head
+ self._branch_nick = head.name
+ self._commit_id = head.commit.hexsha
+ except AttributeError:
+ pass
+ try:
+ # This is for python-git 0.1.6 (that is in debian and ubuntu)
+ head = [head for head in repo.heads if
head.name==repo.active_branch][0]
+ self._branch_nick = head.name
+ self._commit_id = head.commit.id
+ except (IndexError, KeyError):
+ pass
+ if head is None:
+ raise ValueError("Unable to lookup head in %r" % repo)
@property
def revno(self):
"""
Revision number of the branch
"""
- return self._revno
+ return self.commit_id_abbrev
+
+ @property
+ def commit_id(self):
+ """
+ The full commit id
+ """
+ return self._commit_id
+
+ @property
+ def commit_id_abbrev(self):
+ """
+ The abbreviated, 7 character commit id
+ """
+ return self._commit_id[:7]
@property
def branch_nick(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/versiontools-1.8/versiontools.egg-info/PKG-INFO
new/versiontools-1.8.3/versiontools.egg-info/PKG-INFO
--- old/versiontools-1.8/versiontools.egg-info/PKG-INFO 2011-09-14
18:15:01.000000000 +0200
+++ new/versiontools-1.8.3/versiontools.egg-info/PKG-INFO 2012-01-24
14:32:21.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: versiontools
-Version: 1.8
+Version: 1.8.3
Summary: Smart replacement for plain tuple used in __version__
Home-page: https://launchpad.net/versiontools
Author: Zygmunt Krynicki
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
