From fc3ed0694f355e63fe9d96d9b18367554a3b9f371053369adbdc3303a764d553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Aug 2018 13:43:55 +0000 Subject: [PATCH 1/4] Accepting request 629945 from home:sax2:branches:devel:languages:python - Submission to SUSE:SLE-12-SP3:Update:PubClouds This commit tracks the submission for fate#326575 and bsc#1103542 OBS-URL: https://build.opensuse.org/request/show/629945 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-appdirs?expand=0&rev=9 --- python-appdirs.changes | 8 ++++++++ python-appdirs.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/python-appdirs.changes b/python-appdirs.changes index 3f12144..37afd1f 100644 --- a/python-appdirs.changes +++ b/python-appdirs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 14 10:13:51 UTC 2018 - ms@suse.com + +- Submission to SUSE:SLE-12-SP3:Update:PubClouds + + This commit tracks the submission for fate#326575 + and bsc#1103542 + ------------------------------------------------------------------- Tue Aug 8 06:11:57 UTC 2017 - tbechtold@suse.com diff --git a/python-appdirs.spec b/python-appdirs.spec index 2019e16..37ca9fa 100644 --- a/python-appdirs.spec +++ b/python-appdirs.spec @@ -1,7 +1,7 @@ # # spec file for package python-appdirs # -# 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 From 6c7fd671b7dcc2a511ef2ad985ae8fc286de174bed0a308871610df606f379e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Aug 2018 13:47:54 +0000 Subject: [PATCH 2/4] - Use setuptools normally - Run tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-appdirs?expand=0&rev=10 --- python-appdirs.changes | 6 ++++++ python-appdirs.spec | 16 +++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/python-appdirs.changes b/python-appdirs.changes index 37afd1f..062f48d 100644 --- a/python-appdirs.changes +++ b/python-appdirs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 17 13:47:34 UTC 2018 - tchvatal@suse.com + +- Use setuptools normally +- Run tests + ------------------------------------------------------------------- Tue Aug 14 10:13:51 UTC 2018 - ms@suse.com diff --git a/python-appdirs.spec b/python-appdirs.spec index 37ca9fa..9b7b1c7 100644 --- a/python-appdirs.spec +++ b/python-appdirs.spec @@ -23,11 +23,10 @@ Release: 0 Summary: A small Python module for determining platform-specific dirs License: MIT Group: Development/Languages/Python -Url: http://github.com/ActiveState/appdirs +URL: http://github.com/ActiveState/appdirs Source: https://files.pythonhosted.org/packages/source/a/appdirs/appdirs-%{version}.tar.gz -BuildRequires: %{python_module base} +BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -51,14 +50,13 @@ sed -r -i '1s/^#!.*$//' appdirs.py %install %python_install -# fix up egg-info because distutils is bad and should feel bad -%{python_expand rm %{buildroot}%{$python_sitelib}/*.egg-info -cp -r appdirs.egg-info %{buildroot}%{$python_sitelib}/appdirs-%{version}-py%{$python_version}.egg-info -} + +%check +%python_exec setup.py test %files %{python_files} -%defattr(-,root,root,-) -%doc CHANGES.rst LICENSE.txt README.rst +%license LICENSE.txt +%doc CHANGES.rst README.rst %pycache_only %{python_sitelib}/__pycache__/* %{python_sitelib}/appdirs.py* %{python_sitelib}/appdirs-%{version}-py%{python_version}.egg-info From e2ab314351a8c275cc673746cc56ad17ebde09a1dab2c1677446318ad1b3ae01 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Sep 2018 16:59:54 +0000 Subject: [PATCH 3/4] Accepting request 633053 from home:mcepl:work - Clean SPEC and remove circular dependency on python-setuptools OBS-URL: https://build.opensuse.org/request/show/633053 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-appdirs?expand=0&rev=11 --- python-appdirs.changes | 5 +++++ python-appdirs.spec | 5 +++-- remove-setuptools-dependency.patch | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 remove-setuptools-dependency.patch diff --git a/python-appdirs.changes b/python-appdirs.changes index 062f48d..5df7743 100644 --- a/python-appdirs.changes +++ b/python-appdirs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 4 15:23:26 UTC 2018 - Matěj Cepl + +- Clean SPEC and remove circular dependency on python-setuptools + ------------------------------------------------------------------- Fri Aug 17 13:47:34 UTC 2018 - tchvatal@suse.com diff --git a/python-appdirs.spec b/python-appdirs.spec index 9b7b1c7..faddea3 100644 --- a/python-appdirs.spec +++ b/python-appdirs.spec @@ -25,7 +25,8 @@ License: MIT Group: Development/Languages/Python URL: http://github.com/ActiveState/appdirs Source: https://files.pythonhosted.org/packages/source/a/appdirs/appdirs-%{version}.tar.gz -BuildRequires: %{python_module setuptools} +Patch: remove-setuptools-dependency.patch +BuildRequires: %{python_module base} BuildRequires: python-rpm-macros BuildArch: noarch %python_subpackages @@ -52,7 +53,7 @@ sed -r -i '1s/^#!.*$//' appdirs.py %python_install %check -%python_exec setup.py test +%python_exec -munittest discover -v %files %{python_files} %license LICENSE.txt diff --git a/remove-setuptools-dependency.patch b/remove-setuptools-dependency.patch new file mode 100644 index 0000000..33d2a17 --- /dev/null +++ b/remove-setuptools-dependency.patch @@ -0,0 +1,22 @@ +--- a/setup.py ++++ b/setup.py +@@ -9,10 +9,6 @@ except ImportError: + from distutils.core import setup + import appdirs + +-tests_require = [] +-if sys.version_info < (2, 7): +- tests_require.append("unittest2") +- + + def read(fname): + inf = open(os.path.join(os.path.dirname(__file__), fname)) +@@ -45,8 +41,6 @@ setup( + Programming Language :: Python :: Implementation :: CPython + Topic :: Software Development :: Libraries :: Python Modules + """.split('\n') if c.strip()], +- test_suite='test.test_api', +- tests_require=tests_require, + keywords='application directory log cache user', + author='Trent Mick', + author_email='trentm@gmail.com', From 70f048f72629bea35142ab71a62c01f1e1ec464ae742835e80ae683932ddfd58 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 5 Sep 2018 05:38:55 +0000 Subject: [PATCH 4/4] Accepting request 633174 from home:mcepl:work Clean SPEC and remove circular dependency on python-setuptools (Add remove-setuptools-dependency.patch patch to do this) OBS-URL: https://build.opensuse.org/request/show/633174 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-appdirs?expand=0&rev=12 --- python-appdirs.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/python-appdirs.changes b/python-appdirs.changes index 5df7743..ea92737 100644 --- a/python-appdirs.changes +++ b/python-appdirs.changes @@ -2,6 +2,7 @@ Tue Sep 4 15:23:26 UTC 2018 - Matěj Cepl - Clean SPEC and remove circular dependency on python-setuptools + (Add remove-setuptools-dependency.patch patch to do this) ------------------------------------------------------------------- Fri Aug 17 13:47:34 UTC 2018 - tchvatal@suse.com