From e9d1fbbd7db6edb74d8241f93cf8c85dcaac0ec03f48e0bf523940af23c8b379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 10 Aug 2018 13:08:40 +0000 Subject: [PATCH 1/2] - Remove argparse dependency - Remove argparse dependency OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=55 --- python-six-doc.changes | 5 +++++ python-six-doc.spec | 21 +++++++++------------ python-six.changes | 5 +++++ python-six.spec | 19 ++++++------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/python-six-doc.changes b/python-six-doc.changes index c2359f4..1c4f30c 100644 --- a/python-six-doc.changes +++ b/python-six-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/python-six-doc.spec b/python-six-doc.spec index c673ed4..089167f 100644 --- a/python-six-doc.spec +++ b/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) 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 @@ -20,23 +20,20 @@ Name: python-six-doc Version: 1.11.0 Release: 0 -Url: http://pypi.python.org/pypi/six/ 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 -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_module six} BuildRequires: python-rpm-macros -BuildArch: noarch +# 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 @@ -54,7 +51,7 @@ what is provided. cd documentation && make html && rm _build/html/.buildinfo %install -# only build documentation +: # Run tests here to avoid dependency loop %check @@ -66,7 +63,7 @@ popd rm -rf test %files -%defattr(-,root,root) -%doc LICENSE README.rst CHANGES documentation/_build/html +%license LICENSE +%doc README.rst CHANGES documentation/_build/html %changelog diff --git a/python-six.changes b/python-six.changes index 0d8550d..7e69e26 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 10 13:07:30 UTC 2018 - tchvatal@suse.com + +- Remove argparse dependency + ------------------------------------------------------------------- Mon Oct 16 16:49:50 UTC 2017 - jmatejek@suse.com diff --git a/python-six.spec b/python-six.spec index bfaf93e..269b8c8 100644 --- a/python-six.spec +++ b/python-six.spec @@ -1,7 +1,7 @@ # # spec file for package python-six # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -20,21 +20,14 @@ Name: python-six Version: 1.11.0 Release: 0 -Url: http://pypi.python.org/pypi/six/ 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{python_module base} +BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros -%if 0%{?suse_version} > 1110 BuildArch: noarch -%else -BuildRequires: python-argparse -Requires: python-argparse -%endif - %python_subpackages %description @@ -65,9 +58,9 @@ if [ -d %{python_sitelib}/six-%{version}-py%{python_version}.egg-info ]; then rm -r %{python_sitelib}/six-%{version}-%{python_version}.egg-info fi -%files %python_files -%defattr(-,root,root) -%doc LICENSE README.rst CHANGES +%files %{python_files} +%license LICENSE +%doc README.rst CHANGES %{python_sitelib}/six.py* %pycache_only %{python3_sitelib}/__pycache__/* %{python_sitelib}/six-%{version}-py*.egg-info From d7c0f146df1221fb060ee17f0fbee7f63e9f83ea627c4558ab338b7f3810f32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 10 Aug 2018 13:39:25 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=56 --- python-six.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-six.spec b/python-six.spec index 269b8c8..f336c8d 100644 --- a/python-six.spec +++ b/python-six.spec @@ -55,7 +55,7 @@ what is provided. %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 + rm -rf %{python_sitelib}/six-%{version}-%{python_version}.egg-info fi %files %{python_files}