From df4ca78ac8f8179334866162077b7aacd3076afe7f0b52640a371f7738a9940f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 27 Feb 2019 08:26:33 +0000 Subject: [PATCH] Accepting request 679683 from home:jayvdb:noflake8 - Add LICENSE - Compile manually due to switch to pkgutil namespace technique - Add fdupes - Re-instate use of --doctest-modules to increase coverage - Remove undesirable build dependency pytest-sugar - Add missing runtime dependency on python-jaraco.base - Add missing runtime dependency on more-itertools - Add explicit build dependency on python-six - Update to v2.0 * Switch to pkgutil namespace technique for the ``jaraco`` namespace. - enable tests OBS-URL: https://build.opensuse.org/request/show/679683 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jaraco.functools?expand=0&rev=4 --- jaraco.functools-1.20.tar.gz | 3 --- jaraco.functools-2.0.tar.gz | 3 +++ python-jaraco.functools.changes | 16 ++++++++++++- python-jaraco.functools.spec | 40 +++++++++++++++++++++++---------- 4 files changed, 46 insertions(+), 16 deletions(-) delete mode 100644 jaraco.functools-1.20.tar.gz create mode 100644 jaraco.functools-2.0.tar.gz diff --git a/jaraco.functools-1.20.tar.gz b/jaraco.functools-1.20.tar.gz deleted file mode 100644 index 9083f65..0000000 --- a/jaraco.functools-1.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b -size 11063 diff --git a/jaraco.functools-2.0.tar.gz b/jaraco.functools-2.0.tar.gz new file mode 100644 index 0000000..f1a44e8 --- /dev/null +++ b/jaraco.functools-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345 +size 14340 diff --git a/python-jaraco.functools.changes b/python-jaraco.functools.changes index f24c748..bed9d0e 100644 --- a/python-jaraco.functools.changes +++ b/python-jaraco.functools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Feb 26 09:20:58 UTC 2019 - John Vandenberg + +- Add LICENSE +- Compile manually due to switch to pkgutil namespace technique +- Add fdupes +- Re-instate use of --doctest-modules to increase coverage +- Remove undesirable build dependency pytest-sugar +- Add missing runtime dependency on python-jaraco.base +- Add missing runtime dependency on more-itertools +- Add explicit build dependency on python-six +- Update to v2.0 + * Switch to pkgutil namespace technique for the ``jaraco`` namespace. + ------------------------------------------------------------------- Tue Aug 28 10:05:54 UTC 2018 - dmueller@suse.com @@ -6,4 +20,4 @@ Tue Aug 28 10:05:54 UTC 2018 - dmueller@suse.com ------------------------------------------------------------------- Thu Aug 23 10:57:21 UTC 2018 - dheidler@suse.de -- Initial Package +- Initial Package for v1.20 diff --git a/python-jaraco.functools.spec b/python-jaraco.functools.spec index 7339ca0..307f008 100644 --- a/python-jaraco.functools.spec +++ b/python-jaraco.functools.spec @@ -1,7 +1,7 @@ # # spec file for package python-jaraco.functools # -# Copyright (c) 2018 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,29 +12,32 @@ # 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-jaraco.functools -Version: 1.20 +Version: 2.0 Release: 0 Summary: Tools to work with functools License: MIT Group: Development/Languages/Python Url: https://github.com/jaraco/jaraco.functools Source0: https://files.pythonhosted.org/packages/source/j/jaraco.functools/jaraco.functools-%{version}.tar.gz -BuildRequires: %{python_module base} -BuildRequires: %{python_module jaraco.base} +BuildRequires: %{python_module jaraco.base >= 6.1} BuildRequires: %{python_module jaraco.classes} -BuildRequires: %{python_module pytest-sugar} +BuildRequires: %{python_module more-itertools} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} +BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python2-backports.functools_lru_cache BuildRequires: python2-backports.unittest_mock +Requires: python-jaraco.base >= 6.1 +Requires: python-more-itertools %ifpython2 Requires: python-backports.functools_lru_cache %endif @@ -48,7 +51,7 @@ Additional functools in the spirit of stdlib’s functools. %prep %setup -q -n jaraco.functools-%{version} -sed -i -e "s/'pytest_runner'/'pytest-runner'/" setup.py +sed -i 's/--flake8//' pytest.ini rm -rf jaraco.functools.egg-info %build @@ -56,15 +59,28 @@ rm -rf jaraco.functools.egg-info %install %python_install -%{python_expand rm -r %{buildroot}%{$python_sitelib}/jaraco.functools-%{version}-py*-nspkg.pth} + +%python_expand rm %{buildroot}%{$python_sitelib}/jaraco/__init__.py + +%if 0%{?have_python2} && ! 0%{?skip_python2} +%py_compile %{buildroot}%{python2_sitelib}/jaraco/ +%py_compile -O %{buildroot}%{python2_sitelib}/jaraco/ +%endif + +%if 0%{?have_python3} && ! 0%{?skip_python3} +%py3_compile %{buildroot}%{python3_sitelib}/jaraco/ +%py3_compile -O %{buildroot}%{python3_sitelib}/jaraco/ +%endif + +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# remove flake8 / doc tests -sed -i "s,addopts=--doctest-modules --flake8.*,," pytest.ini -%python_expand py.test-%{$python_bin_suffix} +%{python_expand py.test-%{$python_bin_suffix} \ + --ignore=_build.python2 --ignore=_build.python3 +} %files %{python_files} -%defattr(-,root,root) +%license LICENSE %doc docs/*.rst README.rst CHANGES.rst %{python_sitelib}/jaraco.functools-%{version}-py*.egg-info %{python_sitelib}/jaraco/functools.py*