Hello community,
here is the log from the commit of package python-setuptools-git for
openSUSE:Factory checked in at 2015-05-19 23:37:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-setuptools-git (Old)
and /work/SRC/openSUSE:Factory/.python-setuptools-git.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools-git"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-setuptools-git/python-setuptools-git.changes
2013-10-25 11:31:23.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-setuptools-git.new/python-setuptools-git.changes
2015-05-19 23:37:16.000000000 +0200
@@ -1,0 +2,14 @@
+Sat May 16 13:26:27 UTC 2015 - [email protected]
+
+- Remove obsolete hacks of when python2 and 3 specfiles where in the
+ place
+
+-------------------------------------------------------------------
+Tue May 12 15:46:14 UTC 2015 - [email protected]
+
+- update to version 1.1:
+ * no changelog available
+- add test dependency git-core
+- run the tests during build
+
+-------------------------------------------------------------------
Old:
----
pre_checkin.sh
setuptools-git-1.0b1.tar.gz
New:
----
setuptools-git-1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-setuptools-git.spec ++++++
--- /var/tmp/diff_new_pack.mo0rW8/_old 2015-05-19 23:37:17.000000000 +0200
+++ /var/tmp/diff_new_pack.mo0rW8/_new 2015-05-19 23:37:17.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-setuptools-git
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,16 @@
%define mod_name setuptools-git
-%define build_for_python3 0
Name: python-setuptools-git
-Version: 1.0b1
+Version: 1.1
Release: 0
Summary: Setuptools revision control system plugin for Git
License: BSD-3-Clause
Group: Development/Languages/Python
Url: https://github.com/wichert/setuptools-git
Source:
http://pypi.python.org/packages/source/s/setuptools-git/setuptools-git-%{version}.tar.gz
-%if %{build_for_python3}
-BuildRequires: python
-BuildRequires: python3-devel
-BuildRequires: python3-distribute
-Requires: python
-BuildArch: noarch
-%else
+BuildRequires: git-core
BuildRequires: python-devel
BuildRequires: python-setuptools
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -41,17 +34,8 @@
%else
BuildArch: noarch
%endif
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if %{build_for_python3}
-%define local_python python3
-%define local_sitelib %{python3_sitelib}
-%else
-%define local_python python
-%define local_sitelib %{python_sitelib}
-%endif
-
%description
This is a plugin for setuptools that enables git integration. Once
installed, Setuptools can be told to include in a package distribution
@@ -66,13 +50,19 @@
%setup -q -n setuptools-git-%{version}
%build
-%{local_python} setup.py build
+python setup.py build
%install
-%{local_python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+
+%check
+# configure git for the test
+git config --global user.email "[email protected]"
+git config --global user.name "test"
+python setup.py -q test
%files
%defattr(-,root,root,-)
-%{local_sitelib}/*
+%{python_sitelib}/*
%changelog
++++++ setuptools-git-1.0b1.tar.gz -> setuptools-git-1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-1.0b1/PKG-INFO
new/setuptools-git-1.1/PKG-INFO
--- old/setuptools-git-1.0b1/PKG-INFO 2013-01-11 16:12:43.000000000 +0100
+++ new/setuptools-git-1.1/PKG-INFO 2014-08-16 11:08:11.000000000 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: setuptools-git
-Version: 1.0b1
+Version: 1.1
Summary: Setuptools revision control system plugin for Git
Home-page: https://github.com/wichert/setuptools-git
-Author: Yannick Gingras
-Author-email: [email protected]
+Author: Wichert Akkerman
+Author-email: [email protected]
License: BSD
Description: About
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-1.0b1/setup.py
new/setuptools-git-1.1/setup.py
--- old/setuptools-git-1.0b1/setup.py 2013-01-11 16:11:10.000000000 +0100
+++ new/setuptools-git-1.1/setup.py 2014-08-16 11:07:07.000000000 +0200
@@ -1,12 +1,12 @@
from setuptools import setup, find_packages
-version = '1.0b1'
+version = '1.1'
setup(
name="setuptools-git",
version=version,
- mainainer='Wichert Akkerman',
- mainainer_email='[email protected]',
+ maintainer='Wichert Akkerman',
+ maintainer_email='[email protected]',
author="Yannick Gingras",
author_email="[email protected]",
url="https://github.com/wichert/setuptools-git";,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-1.0b1/setuptools_git/__init__.py
new/setuptools-git-1.1/setuptools_git/__init__.py
--- old/setuptools-git-1.0b1/setuptools_git/__init__.py 2013-01-11
16:10:17.000000000 +0100
+++ new/setuptools-git-1.1/setuptools_git/__init__.py 2014-08-16
11:06:54.000000000 +0200
@@ -6,7 +6,6 @@
import posixpath
from os.path import realpath, join
-from subprocess import CalledProcessError
from subprocess import PIPE
from setuptools_git.utils import check_output
@@ -16,6 +15,7 @@
from setuptools_git.utils import hfs_quote
from setuptools_git.utils import compose
from setuptools_git.utils import decompose
+from setuptools_git.utils import CalledProcessError
def ntfsdecode(path):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-1.0b1/setuptools_git/tests.py
new/setuptools-git-1.1/setuptools_git/tests.py
--- old/setuptools-git-1.0b1/setuptools_git/tests.py 2013-01-11
16:10:17.000000000 +0100
+++ new/setuptools-git-1.1/setuptools_git/tests.py 2014-08-16
11:06:54.000000000 +0200
@@ -177,7 +177,7 @@
def test_git_error(self):
import setuptools_git
- from subprocess import CalledProcessError
+ from setuptools_git.utils import CalledProcessError
def do_raise(*args, **kw):
raise CalledProcessError(1, 'git')
@@ -318,7 +318,7 @@
def test_git_error(self):
import setuptools_git
- from subprocess import CalledProcessError
+ from setuptools_git.utils import CalledProcessError
def do_raise(*args, **kw):
raise CalledProcessError(1, 'git')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-1.0b1/setuptools_git/utils.py
new/setuptools-git-1.1/setuptools_git/utils.py
--- old/setuptools-git-1.0b1/setuptools_git/utils.py 2013-01-11
16:10:17.000000000 +0100
+++ new/setuptools-git-1.1/setuptools_git/utils.py 2014-08-16
11:06:54.000000000 +0200
@@ -16,12 +16,32 @@
try:
+ from subprocess import CalledProcessError
+except ImportError:
+ # BBB for Python < 2.5
+ class CalledProcessError(Exception):
+ """
+ This exception is raised when a process run by check_call() or
+ check_output() returns a non-zero exit status.
+
+ The exit status will be stored in the returncode attribute;
+ check_output() will also store the output in the output attribute.
+ """
+ def __init__(self, returncode, cmd, output=None):
+ self.returncode = returncode
+ self.cmd = cmd
+ self.output = output
+
+ def __str__(self):
+ return "Command '%s' returned non-zero exit status %d" %
(self.cmd, self.returncode)
+
+
+try:
from subprocess import check_call
except ImportError:
# BBB for Python < 2.5
def check_call(*popenargs, **kwargs):
from subprocess import call
- from subprocess import CalledProcessError
retcode = call(*popenargs, **kwargs)
cmd = kwargs.get("args")
if cmd is None:
@@ -38,7 +58,6 @@
def check_output(*popenargs, **kwargs):
from subprocess import PIPE
from subprocess import Popen
- from subprocess import CalledProcessError
if 'stdout' in kwargs:
raise ValueError(
'stdout argument not allowed, it will be overridden.')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-1.0b1/setuptools_git.egg-info/PKG-INFO
new/setuptools-git-1.1/setuptools_git.egg-info/PKG-INFO
--- old/setuptools-git-1.0b1/setuptools_git.egg-info/PKG-INFO 2013-01-11
16:12:43.000000000 +0100
+++ new/setuptools-git-1.1/setuptools_git.egg-info/PKG-INFO 2014-08-16
11:08:10.000000000 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: setuptools-git
-Version: 1.0b1
+Version: 1.1
Summary: Setuptools revision control system plugin for Git
Home-page: https://github.com/wichert/setuptools-git
-Author: Yannick Gingras
-Author-email: [email protected]
+Author: Wichert Akkerman
+Author-email: [email protected]
License: BSD
Description: About
-----
