Accepting request 294639 from home:tbechtold:branches:devel:languages:python

New upstream release

OBS-URL: https://build.opensuse.org/request/show/294639
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=72

python-setuptools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-setuptools
 #
-# Copyright (c) 2014 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,7 +17,7 @@
 
 
 Name:           python-setuptools
-Version:        5.4.1
+Version:        15.0
 Release:        0
 Url:            http://pypi.python.org/pypi/setuptools
 Summary:        Easily download, build, install, upgrade, and uninstall Python packages
@@ -27,9 +27,18 @@ Source:         https://pypi.python.org/packages/source/s/setuptools/setuptools-
 Source1:        psfl.txt
 Source2:        zpl.txt
 Patch1:         setuptools-5.4.1-create-sitedir.patch
+# NOTE(toabctl): patch submitted upstream
+# See https://bitbucket.org/pypa/setuptools/pull-request/127/fix-typeerror-for-pytestskip/
+Patch2:         fix-type-error.patch
+# NOTE(toabctl): Fix for SLE11SP3 test failures
+Patch3:         fix-sle11-test-failure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-xml
+# for tests
+BuildRequires:  python-mock
+BuildRequires:  python-pytest
+BuildRequires:  python-pytest-runner
 # needed for SLE
 Requires:       python
 Requires:       python-xml
@@ -53,6 +62,10 @@ especially ones that have dependencies on other packages.
 %prep
 %setup -q -n setuptools-%{version}
 %patch1 -p1
+%patch2 -p1
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%patch3 -p1
+%endif
 find . -type f -name "*.orig" -delete
 
 %build
@@ -65,6 +78,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 touch %{buildroot}%{_sysconfdir}/alternatives/easy_install
 ln -sf %{_sysconfdir}/alternatives/easy_install %{buildroot}/%{_bindir}/easy_install
 
+%check
+export LANG="en_US.UTF-8"
+python setup.py ptr --addopts='-rxs'
+
 %post
 update-alternatives \
     --install %{_bindir}/easy_install easy_install %{_bindir}/easy_install-%{py_ver} 20
@@ -84,6 +101,6 @@ fi
 %{python_sitelib}/setuptools
 %{python_sitelib}/setuptools-%{version}-py%{py_ver}.egg-info
 %{python_sitelib}/easy_install.py*
-%{python_sitelib}/pkg_resources.py*
+%{python_sitelib}/pkg_resources
 
 %changelog