diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-six-doc.changes b/python-six-doc.changes deleted file mode 100644 index 1c4f30c..0000000 --- a/python-six-doc.changes +++ /dev/null @@ -1,62 +0,0 @@ -------------------------------------------------------------------- -Fri Aug 10 13:07:30 UTC 2018 - tchvatal@suse.com - -- Remove argparse dependency - -------------------------------------------------------------------- -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: - - Issue #122: Improve the performance of `six.int2byte` on Python 3. - - Pull request #55 and issue #99: Don't add the `winreg` module to `six.moves` - on non-Windows platforms. - - Pull request #60 and issue #108: Add `six.moves.getcwd` and - `six.moves.getcwdu`. - - Pull request #64: Add `create_unbound_method` to create unbound methods. - -------------------------------------------------------------------- -Thu Apr 16 20:11:49 UTC 2015 - hpj@urpla.net - -- first build of separated docs due to cyclic requirements of - six and Sphinx. - diff --git a/python-six-doc.spec b/python-six-doc.spec deleted file mode 100644 index 66126a3..0000000 --- a/python-six-doc.spec +++ /dev/null @@ -1,69 +0,0 @@ -# -# spec file for package python-six-doc -# -# Copyright (c) 2018 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# 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 https://bugs.opensuse.org/ -# - - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-six-doc -Version: 1.11.0 -Release: 0 -Summary: Python 2 and 3 compatibility utilities -License: MIT -Group: Development/Libraries/Python -URL: http://pypi.python.org/pypi/six/ -Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz -# Test requirements: -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module py} -BuildRequires: %{python_module six} -BuildRequires: python-rpm-macros -# require only one version of Sphinx -BuildRequires: python3-Sphinx -Provides: %{python_module six-doc = %{version}} -BuildArch: noarch - -%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 -what is provided. - -%prep -%setup -q -n six-%{version} - -%build -# due to cyclic requirements between Sphinx and six, -# documentation is build in its own package -cd documentation && make html && rm _build/html/.buildinfo - -%install -: - -# 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 -%license LICENSE -%doc README.rst CHANGES documentation/_build/html - -%changelog diff --git a/python-six.changes b/python-six.changes index b324cd0..a03c2ad 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 10 09:20:52 CET 2018 - mcepl@suse.com + +- Update to 0.12.0: + * `six.add_metaclass` now preserves `__qualname__` from the + original class. + * Add `six.ensure_binary`, `six.ensure_text`, and + `six.ensure_str`. + ------------------------------------------------------------------- Mon Sep 3 15:37:13 UTC 2018 - Hans-Peter Jansen diff --git a/python-six.spec b/python-six.spec index ec8945a..d0a636d 100644 --- a/python-six.spec +++ b/python-six.spec @@ -17,8 +17,21 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +# This is not only because of dependency of testsuite, but mostly +# because of cyclical dependencies between six and Sphinx. +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define test 1 +%bcond_without test +%else +%bcond_with test +%endif +%if %{with test} +Name: python-six-%{flavor} +%else Name: python-six -Version: 1.11.0 +%endif +Version: 1.12.0 Release: 0 Summary: Python 2 and 3 compatibility utilities License: MIT @@ -27,6 +40,11 @@ URL: http://pypi.python.org/pypi/six/ Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz BuildRequires: %{python_module base} BuildRequires: python-rpm-macros +%if %{with test} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module py} +BuildRequires: python3-Sphinx +%endif BuildArch: noarch %python_subpackages @@ -37,20 +55,44 @@ 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. +%package -n python-six-doc +Provides: %{python_module six-doc = %{version}} +Summary: Documentation files for %name +Group: Documentation/HTML + +%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. + +This package provides documentation for %{name}. + + %prep %setup -q -n six-%{version} %build +%if ! %{with test} %python_build -# due to cyclic requirements between Sphinx and six, -# documentation is build in its own package +%else +cd documentation && make html && rm _build/html/.buildinfo +%endif %install +%if ! %{with test} %python_install +%endif -# Run tests in -doc package to avoid dependency loop -# %check -# python test_six.py +%check +%if %{with test} +mkdir test +cp test_six.py test +pushd test +%python_exec %{_bindir}/py.test test_six.py +popd +rm -rf test +%endif %pretrans # bsc#1057496 - egg-info changed from directory to file @@ -61,8 +103,12 @@ fi %files %{python_files} %license LICENSE %doc README.rst CHANGES +%if %{with test} +%doc documentation/_build/html +%else %{python_sitelib}/six.py* %pycache_only %{python3_sitelib}/__pycache__/* %{python_sitelib}/six-%{version}-py*.egg-info +%endif %changelog diff --git a/six-1.11.0.tar.gz b/six-1.11.0.tar.gz deleted file mode 100644 index 7913a34..0000000 --- a/six-1.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 -size 29860 diff --git a/six-1.12.0.tar.gz b/six-1.12.0.tar.gz new file mode 100644 index 0000000..7c2cf76 --- /dev/null +++ b/six-1.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 +size 32725