File project.diff of Package python-six
--- python-six-doc.changes.orig
+++ python-six-doc.changes
@@ -1,44 +1,4 @@
-------------------------------------------------------------------
-Thu Sep 28 07:47:18 UTC 2017 - tbechtold@suse.com
-
-- Fix Source url
-
--------------------------------------------------------------------
-Sat Sep 23 20:49:03 UTC 2017 - arun@gmx.de
-
-- README->README.rst, add CHANGES
-
-- update to version 1.11.0:
- * Pull request #178: `with_metaclass` now properly proxies
- `__prepare__` to the underlying metaclass.
- * Pull request #191: Allow `with_metaclass` to work with metaclasses
- implemented in C.
- * Pull request #203: Add parse_http_list and parse_keqv_list to
- moved urllib.request.
- * Pull request #172 and issue #171: Add unquote_to_bytes to moved
- urllib.parse.
- * Pull request #167: Add `six.moves.getoutput`.
- * Pull request #80: Add `six.moves.urllib_parse.splitvalue`.
- * Pull request #75: Add `six.moves.email_mime_image`.
- * Pull request #72: Avoid creating reference cycles through
- tracebacks in `reraise`.
-
--------------------------------------------------------------------
-Thu Feb 23 14:47:06 UTC 2017 - jmatejek@suse.com
-
-- update for singlespec
-- only use python3 version of Sphinx to build docs
-- provide $flavor-doc for all pythons
-
--------------------------------------------------------------------
-Tue Jan 19 09:07:19 UTC 2016 - toddrme2178@gmail.com
-
-- Run tests in -doc package to avoid dependency loops
- * python-setuptools -> python-six -> python-py -> python-setuptools
- * python-setuptools -> python-six -> python-pytest -> python-setuptools
-- Actually run the tests. They weren't previously being run.
-
--------------------------------------------------------------------
Fri Oct 9 08:17:49 UTC 2015 - mcihar@suse.cz
- Update to 1.10.0:
--- python-six-doc.spec.orig
+++ python-six-doc.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-six-doc
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,37 +12,28 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-six-doc
-Version: 1.11.0
+Version: 1.10.0
Release: 0
Url: http://pypi.python.org/pypi/six/
Summary: Python 2 and 3 compatibility utilities
License: MIT
Group: Development/Libraries/Python
-Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz
+Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: %{python_module six}
-# require old python 2 explicitly to get the ssl module
-BuildRequires: python
-# require only one version of Sphinx for now
-BuildRequires: python3-Sphinx
-# Test requirements:
-BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module py}
-BuildRequires: python-rpm-macros
+BuildRequires: python-Sphinx
+BuildRequires: python-devel
BuildArch: noarch
-Provides: %{python_module six-doc = %{version}}
%description
-Six is a Python 2 and 3 compatibility library. It provides utility
-functions for smoothing over the differences between the Python
-versions with the goal of writing Python code that is compatible on
-both Python versions. See the documentation for more information on
+Six is a Python 2 and 3 compatibility library. It provides utility
+functions for smoothing over the differences between the Python
+versions with the goal of writing Python code that is compatible on
+both Python versions. See the documentation for more information on
what is provided.
%prep
@@ -54,19 +45,9 @@ what is provided.
cd documentation && make html && rm _build/html/.buildinfo
%install
-# only build documentation
-
-# Run tests here to avoid dependency loop
-%check
-mkdir test
-cp test_six.py test
-pushd test
-%python_exec %{_bindir}/py.test test_six.py
-popd
-rm -rf test
%files
%defattr(-,root,root)
-%doc LICENSE README.rst CHANGES documentation/_build/html
+%doc LICENSE README documentation/_build/html
%changelog
--- python-six.changes.orig
+++ python-six.changes
@@ -1,56 +1,4 @@
-------------------------------------------------------------------
-Mon Oct 16 16:49:50 UTC 2017 - jmatejek@suse.com
-
-- remove egg-info directory before installation if it exists,
- because setuptools produce directory and six switched to distutils
- that produce a file
- (and because rpm can't handle that by itself)
- fixes bsc#1057496
-
--------------------------------------------------------------------
-Thu Sep 28 07:47:18 UTC 2017 - tbechtold@suse.com
-
-- Fix Source url
-
--------------------------------------------------------------------
-Sat Sep 23 20:49:03 UTC 2017 - arun@gmx.de
-
-- README->README.rst, add CHANGES
-
-- update to version 1.11.0:
- * Pull request #178: `with_metaclass` now properly proxies
- `__prepare__` to the underlying metaclass.
- * Pull request #191: Allow `with_metaclass` to work with metaclasses
- implemented in C.
- * Pull request #203: Add parse_http_list and parse_keqv_list to
- moved urllib.request.
- * Pull request #172 and issue #171: Add unquote_to_bytes to moved
- urllib.parse.
- * Pull request #167: Add `six.moves.getoutput`.
- * Pull request #80: Add `six.moves.urllib_parse.splitvalue`.
- * Pull request #75: Add `six.moves.email_mime_image`.
- * Pull request #72: Avoid creating reference cycles through
- tracebacks in `reraise`.
-
--------------------------------------------------------------------
-Wed Oct 5 14:33:14 UTC 2016 - jmatejek@suse.com
-
-- update for multipython build
-
--------------------------------------------------------------------
-Tue Feb 9 07:45:20 UTC 2016 - olaf@aepfle.de
-
-- Restore buildarch for SLE_11 to fix build
-
--------------------------------------------------------------------
-Tue Jan 19 09:07:19 UTC 2016 - toddrme2178@gmail.com
-
-- Run tests in -doc package to avoid dependency loops
- * python-setuptools -> python-six -> python-py -> python-setuptools
- * python-setuptools -> python-six -> python-pytest -> python-setuptools
-- Actually run the tests. They weren't previously being run.
-
--------------------------------------------------------------------
Fri Oct 9 08:17:49 UTC 2015 - mcihar@suse.cz
- Update to 1.10.0:
--- python-six.spec.orig
+++ python-six.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-six
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,64 +12,72 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+# NOTE(saschpe): git invocation and pythonpath issues with testrepository
+# enable testing with a build conditional (off by default):
+%bcond_with test
+
Name: python-six
-Version: 1.11.0
+Version: 1.10.0
Release: 0
Url: http://pypi.python.org/pypi/six/
Summary: Python 2 and 3 compatibility utilities
License: MIT
Group: Development/Libraries/Python
-Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz
+Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: %{python_module base}
-BuildRequires: python-rpm-macros
-%if 0%{?suse_version} > 1110
-BuildArch: noarch
-%else
+BuildRequires: python-devel
+%if %{with test}
+# Test requirements:
+BuildRequires: python-py
+BuildRequires: python-pytest
+%endif
+%if 0%{?suse_version} <= 1110
BuildRequires: python-argparse
Requires: python-argparse
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%else
+BuildArch: noarch
+%py_requires
%endif
-%python_subpackages
-
%description
-Six is a Python 2 and 3 compatibility library. It provides utility
-functions for smoothing over the differences between the Python
-versions with the goal of writing Python code that is compatible on
-both Python versions. See the documentation for more information on
+Six is a Python 2 and 3 compatibility library. It provides utility
+functions for smoothing over the differences between the Python
+versions with the goal of writing Python code that is compatible on
+both Python versions. See the documentation for more information on
what is provided.
%prep
%setup -q -n six-%{version}
%build
-%python_build
+python setup.py build
# due to cyclic requirements between Sphinx and six,
# documentation is build in its own package <hpj@urpla.net>
%install
-%python_install
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-# Run tests in -doc package to avoid dependency loop
-# %check
-# python test_six.py
+%if %{with test}
+%check
+python test_six.py
+%endif
%pre
-# bsc#1057496 - egg-info changed from directory to file
-if [ -d %{python_sitelib}/six-%{version}-py%{python_version}.egg-info ]; then
- rm -r %{python_sitelib}/six-%{version}-%{python_version}.egg-info
+# previous versions of the package installed .egg-info as a directory,
+# the new update now installs it as a file. Clean out the directory, should it exist.
+if [ -d %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info ]; then
+ rm -rf %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info
fi
-%files %python_files
+%files
%defattr(-,root,root)
-%doc LICENSE README.rst CHANGES
+%doc LICENSE README
%{python_sitelib}/six.py*
-%pycache_only %{python3_sitelib}/__pycache__/*
-%{python_sitelib}/six-%{version}-py*.egg-info
+%{python_sitelib}/six-%{version}-py%{py_ver}.egg-info
%changelog
