- Revert removal of the code fixing egginfo (boo#1107798)

- Actually we don't need remove-setuptools-dependency.patch,
  when we don't run python setup.py test anymore. So, remove it.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-appdirs?expand=0&rev=14
This commit is contained in:
Matej Cepl 2018-09-10 10:16:35 +00:00 committed by Git OBS Bridge
parent 70f048f726
commit 139b7430fe
3 changed files with 14 additions and 23 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 10 12:07:53 CEST 2018 - Matěj Cepl <mcepl@suse.com>
- Revert removal of the code fixing egginfo (boo#1107798)
- Actually we don't need remove-setuptools-dependency.patch,
when we don't run python setup.py test anymore. So, remove it.
-------------------------------------------------------------------
Tue Sep 4 15:23:26 UTC 2018 - Matěj Cepl <mcepl@suse.com>

View File

@ -25,8 +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
Patch: remove-setuptools-dependency.patch
BuildRequires: %{python_module base}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
%python_subpackages
@ -51,6 +51,12 @@ 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
%fdupes %{buildroot}%{$python_sitelib}
}
%check
%python_exec -munittest discover -v

View File

@ -1,22 +0,0 @@
--- 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',