From a784158d01de657ffc16c6d23fe689e98d66f4b87642473be5b4872ec96e5d87 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:25:10 +0000 Subject: [PATCH] Accepting request 679679 from home:jayvdb:noflake8 - Add LICENSE - Compile manually due to switch to pkgutil namespace technique - Remove bcond_with test, allowing tests suite to run - Remove undesirable build dependencies pytest-flake8 and pytest-runner - Add missing runtime dependency on six - Add explicit build dependency on python-six - Update to v2.0 * Switch to pkgutil namespace technique for the ``jaraco`` namespace. OBS-URL: https://build.opensuse.org/request/show/679679 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jaraco.stream?expand=0&rev=9 --- jaraco.stream-1.2.tar.gz | 3 --- jaraco.stream-2.0.tar.gz | 3 +++ python-jaraco.stream.changes | 12 +++++++++ python-jaraco.stream.spec | 47 +++++++++++++++++------------------- 4 files changed, 37 insertions(+), 28 deletions(-) delete mode 100644 jaraco.stream-1.2.tar.gz create mode 100644 jaraco.stream-2.0.tar.gz diff --git a/jaraco.stream-1.2.tar.gz b/jaraco.stream-1.2.tar.gz deleted file mode 100644 index 83a53dc..0000000 --- a/jaraco.stream-1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b56514708224864d93b8a6e916c02ae7ae4ce822f05946704719bb294971a1b -size 7696 diff --git a/jaraco.stream-2.0.tar.gz b/jaraco.stream-2.0.tar.gz new file mode 100644 index 0000000..db72eaa --- /dev/null +++ b/jaraco.stream-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4 +size 11061 diff --git a/python-jaraco.stream.changes b/python-jaraco.stream.changes index 0da4545..7eaa507 100644 --- a/python-jaraco.stream.changes +++ b/python-jaraco.stream.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Feb 26 08:52:40 UTC 2019 - John Vandenberg + +- Add LICENSE +- Compile manually due to switch to pkgutil namespace technique +- Remove bcond_with test, allowing tests suite to run +- Remove undesirable build dependencies pytest-flake8 and pytest-runner +- Add missing runtime dependency on six +- Add explicit build dependency on python-six +- Update to v2.0 + * Switch to pkgutil namespace technique for the ``jaraco`` namespace. + ------------------------------------------------------------------- Sat Jul 28 17:03:14 UTC 2018 - jengelh@inai.de diff --git a/python-jaraco.stream.spec b/python-jaraco.stream.spec index 493641e..42e2a17 100644 --- a/python-jaraco.stream.spec +++ b/python-jaraco.stream.spec @@ -1,7 +1,7 @@ # # spec file for package python-jaraco.stream # -# 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,41 +12,38 @@ # 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/ # %define _name jaraco.stream %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test Name: python-jaraco.stream -Version: 1.2 +Version: 2.0 Release: 0 Summary: Routines for dealing with data streams License: MIT Group: Development/Languages/Python Url: https://github.com/jaraco/jaraco.stream Source: https://files.pythonhosted.org/packages/source/j/%{_name}/%{_name}-%{version}.tar.gz -BuildRequires: %{python_module base} -BuildRequires: %{python_module jaraco.base} -BuildRequires: %{python_module jaraco.packaging} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} -# SECTION documentation requirements -BuildRequires: %{python_module Sphinx} -BuildRequires: %{python_module pylons-sphinx-themes} -# /SECTION BuildRequires: fdupes BuildRequires: python-rpm-macros -%if %{with test} +# SECTION test requirements BuildRequires: %{python_module more-itertools} -BuildRequires: %{python_module pytest-flake8} -BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module rst.linker} -%endif -Requires: python-jaraco.base +BuildRequires: %{python_module six} +# /SECTION +# SECTION documentation requirements +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module jaraco.packaging >= 6.1} +BuildRequires: %{python_module pylons-sphinx-themes} +BuildRequires: %{python_module rst.linker >= 1.9} +# /SECTION +Requires: python-jaraco.base >= 6.1 Requires: python-more-itertools +Requires: python-six BuildArch: noarch %python_subpackages @@ -65,6 +62,7 @@ This package contains documentation files for %{name}. %prep %setup -q -n %{_name}-%{version} +sed -i 's/--flake8//' pytest.ini rm -rf jaraco.stream.egg-info %build @@ -73,26 +71,25 @@ rm -rf jaraco.stream.egg-info %install %python_install -# We aren't using the nspkg approach anymore -%{python_expand rm -r %{buildroot}%{$python_sitelib}/jaraco.stream-%{version}-py*-nspkg.pth -%fdupes %{buildroot}%{$python_sitelib} +# We will package the namespace __init__.py separately +%{python_expand rm %{buildroot}%{$python_sitelib}/jaraco/__init__.py* +rm -rf %{buildroot}%{$python_sitelib}/jaraco/__pycache__/ +%fdupes -s %{buildroot}%{$python_sitelib} } -%if %{with test} %check %{python_expand cp jaraco/stream/somefile.json.gz build/lib/jaraco/stream/ -py.test-%{$python_bin_suffix} build/lib/jaraco +py.test-%{$python_bin_suffix} \ + --ignore=_build.python3 --ignore _build.python2 } -%endif %files %{python_files} -%defattr(-,root,root) +%license LICENSE %doc CHANGES.rst README.rst %{python_sitelib}/jaraco.stream-%{version}-py*.egg-info %{python_sitelib}/jaraco/stream/ %files -n %{name}-doc -%defattr(-,root,root,-) %doc build/sphinx/html %changelog