Hello community,
here is the log from the commit of package python-setuptools_scm for
openSUSE:Factory checked in at 2017-03-09 01:45:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-setuptools_scm (Old)
and /work/SRC/openSUSE:Factory/.python-setuptools_scm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools_scm"
Thu Mar 9 01:45:36 2017 rev:6 rq:477288 version:1.15.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-setuptools_scm/python-setuptools_scm.changes
2017-01-23 11:30:53.357185941 +0100
+++
/work/SRC/openSUSE:Factory/.python-setuptools_scm.new/python-setuptools_scm.changes
2017-03-09 01:45:37.570210294 +0100
@@ -1,0 +2,17 @@
+Fri Mar 3 15:24:56 UTC 2017 - jmate...@suse.com
+
+- fix singlespec build
+- no-generic-python.patch - run tests with the right python executable
+ to prevent stray pyc files where they don't belong
+
+-------------------------------------------------------------------
+Thu Mar 2 15:06:07 UTC 2017 - tbecht...@suse.com
+
+- Fix Source url
+
+-------------------------------------------------------------------
+Thu Mar 2 14:48:44 UTC 2017 - tbecht...@suse.com
+
+- Fix python_module macro definition
+
+-------------------------------------------------------------------
New:
----
no-generic-python.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-setuptools_scm.spec ++++++
--- /var/tmp/diff_new_pack.ysNyYM/_old 2017-03-09 01:45:38.170125348 +0100
+++ /var/tmp/diff_new_pack.ysNyYM/_new 2017-03-09 01:45:38.174124782 +0100
@@ -16,6 +16,7 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-setuptools_scm
Version: 1.15.0
Release: 0
@@ -23,22 +24,23 @@
License: MIT
Group: Development/Languages/Python
Url: https://github.com/pypa/setuptools_scm
-Source:
https://pypi.io/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz
-BuildRequires: python-devel
-BuildRequires: python-setuptools
+Source:
https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM use sys.executable for running python in
test_regressions.py
+Patch0: no-generic-python.patch
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
+BuildRequires: python-rpm-macros
# Testing requirements
+BuildRequires: %{python_module pytest}
BuildRequires: git
BuildRequires: mercurial
-BuildRequires: python-pytest
Requires: python-setuptools
Recommends: git
Recommends: mecurial
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()")}
-%else
BuildArch: noarch
-%endif
+
+%python_subpackages
%description
The setuptools_scm package handles managing your python package versions
@@ -46,17 +48,18 @@
%prep
%setup -q -n setuptools_scm-%{version}
+%patch0 -p1
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
%check
-PYTHONPATH=%{buildroot}%{python_sitelib} py.test
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_bin_suffix}
-%files
+%files %python_files
%defattr(-,root,root,-)
%doc README.rst LICENSE CHANGELOG.rst
%{python_sitelib}/*
++++++ no-generic-python.patch ++++++
diff --git a/testing/test_regressions.py b/testing/test_regressions.py
index 4a067b3..9d24d61 100644
--- a/testing/test_regressions.py
+++ b/testing/test_regressions.py
@@ -18,16 +18,16 @@ def test_pkginfo_noscmroot(tmpdir, monkeypatch):
'from setuptools import setup;'
'setup(use_scm_version={"root": ".."})')
- _, stderr, ret = do_ex('python setup.py --version', p)
+ _, stderr, ret = do_ex((sys.executable, 'setup.py', '--version'), p)
assert 'setuptools-scm was unable to detect version for' in stderr
assert ret == 1
p.join("PKG-INFO").write('Version: 1.0')
- res = do('python setup.py --version', p)
+ res = do((sys.executable, 'setup.py', '--version'), p)
assert res == '1.0'
do('git init', p.dirpath())
- res = do('python setup.py --version', p)
+ res = do((sys.executable, 'setup.py', '--version'), p)
assert res == '1.0'
@@ -64,7 +64,7 @@ setup(use_scm_version=vcfg)
''')
p.join("PKG-INFO").write('Version: 1.0')
- res = do('python setup.py --version', p)
+ res = do((sys.executable, 'setup.py', '--version'), p)
assert res == '1.0'
