From eb68b0461d0c3021e054c8dfdc0ff9f24b565072d8fb7d27ee4cb655bbb813b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 7 May 2019 13:07:46 +0000 Subject: [PATCH 1/2] Accepting request 701313 from home:pgajdos - version update to 1.6.1 * lot of changes, see CHANGES.rst - remove -doc OBS-URL: https://build.opensuse.org/request/show/701313 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-hupper?expand=0&rev=9 --- hupper-1.0.tar.gz | 3 -- hupper-1.6.1.tar.gz | 3 ++ pre_checkin.sh | 3 -- python-hupper-doc.changes | 9 ------ python-hupper-doc.spec | 63 --------------------------------------- python-hupper.changes | 7 +++++ python-hupper.spec | 12 ++++++-- 7 files changed, 20 insertions(+), 80 deletions(-) delete mode 100644 hupper-1.0.tar.gz create mode 100644 hupper-1.6.1.tar.gz delete mode 100644 pre_checkin.sh delete mode 100644 python-hupper-doc.changes delete mode 100644 python-hupper-doc.spec diff --git a/hupper-1.0.tar.gz b/hupper-1.0.tar.gz deleted file mode 100644 index 3a46939..0000000 --- a/hupper-1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afb9584fc387c962824627bb243d7d92c276df608a771b17c8b727a7de34920a -size 30734 diff --git a/hupper-1.6.1.tar.gz b/hupper-1.6.1.tar.gz new file mode 100644 index 0000000..8f1c755 --- /dev/null +++ b/hupper-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe8febd68cec7fbed174fcbb0b42c427f96c8a7471c1cd4999fc698dd8dc6c34 +size 39773 diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index a2a3860..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cp python-hupper.changes python-hupper-doc.changes - diff --git a/python-hupper-doc.changes b/python-hupper-doc.changes deleted file mode 100644 index 0e836b2..0000000 --- a/python-hupper-doc.changes +++ /dev/null @@ -1,9 +0,0 @@ -------------------------------------------------------------------- -Tue Dec 4 13:07:06 UTC 2018 - Matej Cepl - -- Remove superfluous devel dependency for noarch package - -------------------------------------------------------------------- -Fri Jul 14 17:41:31 UTC 2017 - aloisio@gmx.com - -- Initial package (1.0) diff --git a/python-hupper-doc.spec b/python-hupper-doc.spec deleted file mode 100644 index b3dcd22..0000000 --- a/python-hupper-doc.spec +++ /dev/null @@ -1,63 +0,0 @@ -# -# spec file for package python-hupper-doc -# -# 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-hupper-doc -Version: 1.0 -Release: 0 -Summary: Documentation for python-hupper -License: MIT -Group: Documentation/HTML -Url: https://pylonsproject.org/ -Source0: https://files.pythonhosted.org/packages/source/h/hupper/hupper-%{version}.tar.gz -BuildRequires: %{python_module hupper = %{version}} -BuildRequires: %{python_module setuptools} -# SECTION documentation requirements -BuildRequires: python3-Sphinx -BuildRequires: python3-pylons-sphinx-themes -# /SECTION -# SECTION test requirements -BuildRequires: %{python_module pytest-cov} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module watchdog} -# /SECTION -BuildRequires: python-rpm-macros -Provides: %{python_module hupper-doc = %{version}} -BuildArch: noarch - -%description -This package contains documentation files for python-hupper. - -%prep -%setup -q -n hupper-%{version} - -%build -%{_python_use_flavor python3} -%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo - -%install -# nothing to do - -%check -%python_exec %{_bindir}/py.test - -%files -%defattr(-,root,root,-) -%doc build/sphinx/html - -%changelog diff --git a/python-hupper.changes b/python-hupper.changes index 0e836b2..0385d68 100644 --- a/python-hupper.changes +++ b/python-hupper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 7 12:14:04 UTC 2019 - pgajdos@suse.com + +- version update to 1.6.1 + * lot of changes, see CHANGES.rst +- remove -doc + ------------------------------------------------------------------- Tue Dec 4 13:07:06 UTC 2018 - Matej Cepl diff --git a/python-hupper.spec b/python-hupper.spec index f9aaac4..475b615 100644 --- a/python-hupper.spec +++ b/python-hupper.spec @@ -1,7 +1,7 @@ # # spec file for package python-hupper # -# 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 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-hupper -Version: 1.0 +Version: 1.6.1 Release: 0 Summary: An in-process file monitor License: MIT @@ -28,6 +28,11 @@ Source0: https://files.pythonhosted.org/packages/source/h/hupper/hupper-% BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +# SECTION test requirements +BuildRequires: %{python_module pytest-cov} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module watchdog} +# /SECTION Requires: python-watchdog Requires(post): update-alternatives Requires(postun): update-alternatives @@ -58,6 +63,9 @@ rm -rf src/hupper.egg-info %postun %python_uninstall_alternative hupper +%check +%pytest + %files %{python_files} %license LICENSE.txt %doc CHANGES.rst CONTRIBUTING.rst README.rst From fcbca1392e97258132176ad637a8233905af8748ca4f6557e64b952415660b16 Mon Sep 17 00:00:00 2001 From: Todd R Date: Sun, 19 May 2019 23:51:29 +0000 Subject: [PATCH 2/2] Accepting request 704090 from home:TheBlackCat:branches:devel:languages:python - Switch to wheel, which doesn't have the problematic CC-noncomercial licensed documentation. OBS-URL: https://build.opensuse.org/request/show/704090 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-hupper?expand=0&rev=10 --- hupper-1.6.1-py2.py3-none-any.whl | 3 +++ hupper-1.6.1.tar.gz | 3 --- python-hupper.changes | 6 ++++++ python-hupper.spec | 30 ++++++++++++------------------ 4 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 hupper-1.6.1-py2.py3-none-any.whl delete mode 100644 hupper-1.6.1.tar.gz diff --git a/hupper-1.6.1-py2.py3-none-any.whl b/hupper-1.6.1-py2.py3-none-any.whl new file mode 100644 index 0000000..52aa66c --- /dev/null +++ b/hupper-1.6.1-py2.py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb33b8f1de73a3566f4bd7decc620d0c6de7d7da9cdf176b6ad310fe037d6106 +size 23475 diff --git a/hupper-1.6.1.tar.gz b/hupper-1.6.1.tar.gz deleted file mode 100644 index 8f1c755..0000000 --- a/hupper-1.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe8febd68cec7fbed174fcbb0b42c427f96c8a7471c1cd4999fc698dd8dc6c34 -size 39773 diff --git a/python-hupper.changes b/python-hupper.changes index 0385d68..32c96e4 100644 --- a/python-hupper.changes +++ b/python-hupper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 19 23:39:33 UTC 2019 - Todd R + +- Switch to wheel, which doesn't have the problematic + CC-noncomercial licensed documentation. + ------------------------------------------------------------------- Tue May 7 12:14:04 UTC 2019 - pgajdos@suse.com diff --git a/python-hupper.spec b/python-hupper.spec index 475b615..e143db4 100644 --- a/python-hupper.spec +++ b/python-hupper.spec @@ -24,19 +24,16 @@ Summary: An in-process file monitor License: MIT Group: Development/Languages/Python URL: https://pylonsproject.org/ -Source0: https://files.pythonhosted.org/packages/source/h/hupper/hupper-%{version}.tar.gz -BuildRequires: %{python_module setuptools} +# Wheels lack files with problematic noncommercial license +Source: https://files.pythonhosted.org/packages/py2.py3/h/hupper/hupper-%{version}-py2.py3-none-any.whl +BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros -# SECTION test requirements -BuildRequires: %{python_module pytest-cov} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module watchdog} -# /SECTION Requires: python-watchdog Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch + %python_subpackages %description @@ -45,15 +42,14 @@ imported Python files in sys.modules as well as custom paths. When files are changed the process is restarted. %prep -%setup -q -n hupper-%{version} -rm -rf src/hupper.egg-info +%setup -q -c -T %build -%python_build +# Not Needed %install -%python_install -%python_expand %fdupes -s %{buildroot}/%{$python_sitelib} +%python_expand pip%{$python_bin_suffix} install --root=%{buildroot} %{SOURCE0} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/hupper @@ -63,13 +59,11 @@ rm -rf src/hupper.egg-info %postun %python_uninstall_alternative hupper -%check -%pytest - %files %{python_files} -%license LICENSE.txt -%doc CHANGES.rst CONTRIBUTING.rst README.rst %python_alternative %{_bindir}/hupper -%{python_sitelib}/* +%license %{python_sitelib}/hupper-%{version}.dist-info/LICENSE.txt +%{python_sitelib}/hupper-%{version}.dist-info/ +%{python_sitelib}/hupper/ + %changelog