From 4ae63bf0b1c1bc9ac641703b3ac36eceb310870c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 27 May 2014 13:12:59 +0000 Subject: [PATCH 01/58] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 516e58666c027d5d0329289db3af1af1a2ccb848 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Thu, 29 May 2014 13:05:26 +0200 Subject: [PATCH 02/58] Initial import of package --- .gitignore | 2 + python-click.spec | 110 ++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 113 insertions(+) create mode 100644 python-click.spec diff --git a/.gitignore b/.gitignore index e69de29..3d35a65 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/click-1.1.tar.gz +/click-1.1-tests.tgz diff --git a/python-click.spec b/python-click.spec new file mode 100644 index 0000000..b809c01 --- /dev/null +++ b/python-click.spec @@ -0,0 +1,110 @@ +# Created by pyp2rpm-1.0.1 +%global pypi_name click +%global with_python3 1 + +%global py2v %(%{__python2} -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))") +%global py3v %(%{__python3} -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + + +Name: python-%{pypi_name} +Version: 1.1 +Release: 1%{?dist} +Summary: A simple wrapper around optparse for powerful command line utilities + +License: BSD +URL: http://github.com/mitsuhiko/click +Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +# Tests are not included in pypi package, checked from github +Source1: click-%{version}-tests.tgz +BuildArch: noarch + +BuildRequires: python-devel +BuildRequires: python-setuptools +BuildRequires: pytest + +%if %{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pytest +%endif # if with_python3 + + +%description +click is a Python package for creating beautiful command line +interfaces in a composable way with as little amount of code as necessary. +It's the "Command Line Interface Creation Kit". It's highly configurable but +comes with good defaults out of the box. + +%if 0%{?with_python3} +%package -n python3-%{pypi_name} +Summary: A simple wrapper around optparse for powerful command line utilities + + +%description -n python3-%{pypi_name} +click is a Python 3 package for creating beautiful command line +interfaces in a composable way with as little amount of code as necessary. +It's the "Command Line Interface Creation Kit". It's highly configurable but +comes with good defaults out of the box. +%endif # with_python3 + + +%prep +%setup -q -n %{pypi_name}-%{version} + +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} + +%endif # with_python3 + + +%build +%{__python2} setup.py build + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif # with_python3 + + +%install +# Must do the subpackages' install first because the scripts in /usr/bin are +# overwritten with every setup.py install (and we want the python2 version +# to be the default for now). +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install --skip-build --root %{buildroot} +popd +%endif # with_python3 + +%{__python2} setup.py install --skip-build --root %{buildroot} + +%check +tar xzf %{SOURCE1} +PYTHONPATH=`pwd` py.test-%{py2v} tests --tb=long --verbose +%if 0%{?with_python3} +pushd %{py3dir} +tar xzf %{SOURCE1} +LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=`pwd` py.test-%{py3v} tests --tb=long --verbose +popd +%endif + +%files +%doc README +%{python2_sitelib}/%{pypi_name}/* +%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%if 0%{?with_python3} +%files -n python3-%{pypi_name} +%doc README +%{python3_sitelib}/%{pypi_name}/* +%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%endif # with_python3 + + +%changelog +* Mon May 12 2014 Robert Kuska - 1.1-1 +- Update source + +* Wed May 07 2014 Robert Kuska - 0.6-1 +- Initial package. diff --git a/sources b/sources index e69de29..d2adf09 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +46d3692bcfaa11aa71cbbc71236dbe75 click-1.1-tests.tgz From 2d3d571be66c1a9a38b7d3c31ae7a4b8f09eab5d Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Thu, 29 May 2014 13:19:23 +0200 Subject: [PATCH 03/58] Add click sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index d2adf09..45039f5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +cb5a9b715bfffe7a297d107829978f45 click-1.1.tar.gz 46d3692bcfaa11aa71cbbc71236dbe75 click-1.1-tests.tgz From db8bcb533163f7d79d48ac28ce386bc185da533e Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Thu, 29 May 2014 18:24:47 +0200 Subject: [PATCH 04/58] Upload sources without pycache --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 45039f5..e651c0d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +33b9da7e95512dbf658cdba31cdb8a2e click-1.1-tests.tgz cb5a9b715bfffe7a297d107829978f45 click-1.1.tar.gz -46d3692bcfaa11aa71cbbc71236dbe75 click-1.1-tests.tgz From 0768177d3cf201c18506d4ce17247b57167c31e9 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Thu, 29 May 2014 18:26:01 +0200 Subject: [PATCH 05/58] Upload sources without pycache --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index b809c01..49fb352 100644 --- a/python-click.spec +++ b/python-click.spec @@ -8,7 +8,7 @@ Name: python-%{pypi_name} Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -103,6 +103,9 @@ popd %changelog +* Thu May 29 2014 Robert Kuska - 1.1-2 +- Remove __pycache__ folder from tests + * Mon May 12 2014 Robert Kuska - 1.1-1 - Update source From 853d56737a62057284b4cfbe71e9347da58c79af Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Fri, 6 Jun 2014 09:01:00 +0200 Subject: [PATCH 06/58] Make click own its folder, use devel macros --- python-click.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/python-click.spec b/python-click.spec index 49fb352..72d1c78 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,13 +2,9 @@ %global pypi_name click %global with_python3 1 -%global py2v %(%{__python2} -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))") -%global py3v %(%{__python3} -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))") - - Name: python-%{pypi_name} Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -82,27 +78,31 @@ popd %check tar xzf %{SOURCE1} -PYTHONPATH=`pwd` py.test-%{py2v} tests --tb=long --verbose +PYTHONPATH=$(pwd) py.test-%{python2_version} tests --tb=long --verbose %if 0%{?with_python3} pushd %{py3dir} tar xzf %{SOURCE1} -LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=`pwd` py.test-%{py3v} tests --tb=long --verbose +LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose popd %endif %files %doc README -%{python2_sitelib}/%{pypi_name}/* +%{python2_sitelib}/%{pypi_name} %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %if 0%{?with_python3} %files -n python3-%{pypi_name} %doc README -%{python3_sitelib}/%{pypi_name}/* +%{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %endif # with_python3 %changelog +* Fri Jun 06 2014 Robert Kuska - 1.1-3 +- Make click own its folder +- Use pythonX_version macros from devel package + * Thu May 29 2014 Robert Kuska - 1.1-2 - Remove __pycache__ folder from tests From bac56856a71182bb630301bdac60cdc31bbbd240 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Thu, 12 Jun 2014 10:51:47 +0200 Subject: [PATCH 07/58] Update to 2.0 --- .gitignore | 2 ++ python-click.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3d35a65..4bb15bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /click-1.1.tar.gz /click-1.1-tests.tgz +/click-2.0.tar.gz +/click-2.0-tests.tgz diff --git a/python-click.spec b/python-click.spec index 72d1c78..f88377e 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,8 +3,8 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 1.1 -Release: 3%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -99,6 +99,9 @@ popd %changelog +* Thu Jun 12 2014 Robert Kuska - 2.0-1 +- Update to 2.0 + * Fri Jun 06 2014 Robert Kuska - 1.1-3 - Make click own its folder - Use pythonX_version macros from devel package diff --git a/sources b/sources index e651c0d..b9e7d03 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -33b9da7e95512dbf658cdba31cdb8a2e click-1.1-tests.tgz -cb5a9b715bfffe7a297d107829978f45 click-1.1.tar.gz +259ebb6fcf28a72df2104db8f5a22962 click-2.0.tar.gz +ce5918a6374fb5c2496e5a8d9988d2f1 click-2.0-tests.tgz From 709809af70496e350ac3e8d31dc4030dda8a524a Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 30 Jun 2014 12:33:12 +0200 Subject: [PATCH 08/58] Update to 2.2 --- python-click.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python-click.spec b/python-click.spec index f88377e..33c19b5 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,7 +3,7 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 2.0 +Version: 2.2 Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities @@ -11,7 +11,6 @@ License: BSD URL: http://github.com/mitsuhiko/click Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz # Tests are not included in pypi package, checked from github -Source1: click-%{version}-tests.tgz BuildArch: noarch BuildRequires: python-devel @@ -77,11 +76,9 @@ popd %{__python2} setup.py install --skip-build --root %{buildroot} %check -tar xzf %{SOURCE1} PYTHONPATH=$(pwd) py.test-%{python2_version} tests --tb=long --verbose %if 0%{?with_python3} pushd %{py3dir} -tar xzf %{SOURCE1} LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose popd %endif @@ -99,6 +96,9 @@ popd %changelog +* Mon Jun 30 2014 Robert Kuska - 2.2-1 +- Update to 2.2 + * Thu Jun 12 2014 Robert Kuska - 2.0-1 - Update to 2.0 From c7aabbf8deb60f42e98b877b5e2070c54ca4119e Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 30 Jun 2014 13:25:06 +0200 Subject: [PATCH 09/58] Updated sources --- .gitignore | 1 + sources | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4bb15bf..a8a4651 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /click-1.1-tests.tgz /click-2.0.tar.gz /click-2.0-tests.tgz +/click-2.2.tar.gz diff --git a/sources b/sources index b9e7d03..cc645fa 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -259ebb6fcf28a72df2104db8f5a22962 click-2.0.tar.gz -ce5918a6374fb5c2496e5a8d9988d2f1 click-2.0-tests.tgz +e07460aab221e1b7ceee0018122e04a9 click-2.2.tar.gz From ac6e039b1ec56d49641b5e0be9b66c3fa71c4fd4 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Wed, 16 Jul 2014 08:57:22 +0200 Subject: [PATCH 10/58] Update to 2.4 --- .gitignore | 1 + python-click.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a8a4651..41bbb99 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /click-2.0.tar.gz /click-2.0-tests.tgz /click-2.2.tar.gz +/click-2.4.tar.gz diff --git a/python-click.spec b/python-click.spec index 33c19b5..15e9ecd 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,14 +3,13 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 2.2 +Version: 2.4 Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD URL: http://github.com/mitsuhiko/click Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -# Tests are not included in pypi package, checked from github BuildArch: noarch BuildRequires: python-devel @@ -96,6 +95,9 @@ popd %changelog +* Wed Jul 16 2014 Robert Kuska - 2.4-1 +- Update to 2.4 + * Mon Jun 30 2014 Robert Kuska - 2.2-1 - Update to 2.2 diff --git a/sources b/sources index cc645fa..fadd6b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e07460aab221e1b7ceee0018122e04a9 click-2.2.tar.gz +7affaac2973184810c018fab7cedca4f click-2.4.tar.gz From 8a432fa9ae577f40bcfb23b9ec3f5925f85f9419 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 18 Aug 2014 13:49:03 +0200 Subject: [PATCH 11/58] Update to 3.1 --- .gitignore | 1 + python-click.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 41bbb99..69487c0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /click-2.0-tests.tgz /click-2.2.tar.gz /click-2.4.tar.gz +/click-3.1.tar.gz diff --git a/python-click.spec b/python-click.spec index 15e9ecd..d839f0c 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,7 +3,7 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 2.4 +Version: 3.1 Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities @@ -95,6 +95,9 @@ popd %changelog +* Mon Aug 18 2014 Robert Kuska - 3.1-1 +- Update to 3.1 + * Wed Jul 16 2014 Robert Kuska - 2.4-1 - Update to 2.4 diff --git a/sources b/sources index fadd6b5..3c80001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7affaac2973184810c018fab7cedca4f click-2.4.tar.gz +6fc0aa839e01ac1d05c4a823c698b6b2 click-3.1.tar.gz From 77b8ec099be46014201de4279737356c1312a3f5 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Sun, 24 Aug 2014 14:51:49 +0200 Subject: [PATCH 12/58] Update to 3.2 --- .gitignore | 1 + python-click.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 69487c0..6d827b1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /click-2.2.tar.gz /click-2.4.tar.gz /click-3.1.tar.gz +/click-3.2.tar.gz diff --git a/python-click.spec b/python-click.spec index d839f0c..d7df3fc 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,7 +3,7 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 3.1 +Version: 3.2 Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities @@ -95,6 +95,9 @@ popd %changelog +* Sun Aug 24 2014 Robert Kuska - 3.2-1 +- Update to 3.2 + * Mon Aug 18 2014 Robert Kuska - 3.1-1 - Update to 3.1 diff --git a/sources b/sources index 3c80001..5e13283 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6fc0aa839e01ac1d05c4a823c698b6b2 click-3.1.tar.gz +f8a439029337ff39ed814ae5ce948318 click-3.2.tar.gz From 94b3a35d7a1b8fe0752acba9e97972120ef4baf4 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Sun, 24 Aug 2014 17:42:07 +0200 Subject: [PATCH 13/58] Add patch for exception check of TypeError --- ...-Change-exception-check-of-TypeError.patch | 25 +++++++++++++++++++ python-click.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Change-exception-check-of-TypeError.patch diff --git a/0001-Change-exception-check-of-TypeError.patch b/0001-Change-exception-check-of-TypeError.patch new file mode 100644 index 0000000..b263057 --- /dev/null +++ b/0001-Change-exception-check-of-TypeError.patch @@ -0,0 +1,25 @@ +From 1b7ea533ea79bacbb14979e92416fa03b22ee774 Mon Sep 17 00:00:00 2001 +From: Robert Kuska +Date: Sun, 24 Aug 2014 15:42:41 +0200 +Subject: [PATCH] Change exception check of TypeError + +--- + click/core.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/click/core.py b/click/core.py +index b4c7368..fd179a2 100644 +--- a/click/core.py ++++ b/click/core.py +@@ -432,7 +432,7 @@ class Context(object): + except TypeError as e: + if not injected_arguments: + raise +- if 'got multiple values for keyword argument' in str(e): ++ if 'got multiple values for' in str(e): + raise RuntimeError( + 'You called .invoke() on the context with a command ' + 'but provided parameters as positional arguments. ' +-- +1.9.3 + diff --git a/python-click.spec b/python-click.spec index d7df3fc..083afca 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,12 +4,14 @@ Name: python-%{pypi_name} Version: 3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD URL: http://github.com/mitsuhiko/click Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +#https://github.com/mitsuhiko/click/pull/209 +Patch1: 0001-Change-exception-check-of-TypeError.patch BuildArch: noarch BuildRequires: python-devel @@ -44,6 +46,7 @@ comes with good defaults out of the box. %prep %setup -q -n %{pypi_name}-%{version} +%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -95,6 +98,9 @@ popd %changelog +* Sun Aug 24 2014 Robert Kuska - 3.2-2 +- Add patch for exception check of TypeError + * Sun Aug 24 2014 Robert Kuska - 3.2-1 - Update to 3.2 From 22c8d0401f2104146eb18520246095f593912d53 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Fri, 3 Oct 2014 10:11:33 +0200 Subject: [PATCH 14/58] Update to 3.3 --- .gitignore | 1 + python-click.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6d827b1..9b2d010 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /click-2.4.tar.gz /click-3.1.tar.gz /click-3.2.tar.gz +/click-3.3.tar.gz diff --git a/python-click.spec b/python-click.spec index 083afca..1d5a076 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,13 +3,14 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 3.2 -Release: 2%{?dist} +Version: 3.3 +Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD URL: http://github.com/mitsuhiko/click Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +#In upstream since v3.3 #https://github.com/mitsuhiko/click/pull/209 Patch1: 0001-Change-exception-check-of-TypeError.patch BuildArch: noarch @@ -46,7 +47,7 @@ comes with good defaults out of the box. %prep %setup -q -n %{pypi_name}-%{version} -%patch1 -p1 +#%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -98,6 +99,9 @@ popd %changelog +* Fri Oct 03 2014 Robert Kuska - 3.3-1 +- Update to 3.3 + * Sun Aug 24 2014 Robert Kuska - 3.2-2 - Add patch for exception check of TypeError diff --git a/sources b/sources index 5e13283..3868637 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8a439029337ff39ed814ae5ce948318 click-3.2.tar.gz +40edaba4d216915a8326c5b2cb52781d click-3.3.tar.gz From 0ca76ab6ada1c234a77aac9608d2d22719c2eb9c Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Wed, 1 Apr 2015 08:25:46 +0200 Subject: [PATCH 15/58] Update to v4.0 --- .gitignore | 1 + python-click.spec | 9 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9b2d010..6ea7d40 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /click-3.1.tar.gz /click-3.2.tar.gz /click-3.3.tar.gz +/click-4.0.tar.gz diff --git a/python-click.spec b/python-click.spec index 1d5a076..b19b909 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,16 +3,13 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 3.3 +Version: 4.0 Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD URL: http://github.com/mitsuhiko/click Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -#In upstream since v3.3 -#https://github.com/mitsuhiko/click/pull/209 -Patch1: 0001-Change-exception-check-of-TypeError.patch BuildArch: noarch BuildRequires: python-devel @@ -47,7 +44,6 @@ comes with good defaults out of the box. %prep %setup -q -n %{pypi_name}-%{version} -#%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -99,6 +95,9 @@ popd %changelog +* Wed Apr 01 2015 Robert Kuska - 4.0-1 +- Update to 4.0 + * Fri Oct 03 2014 Robert Kuska - 3.3-1 - Update to 3.3 diff --git a/sources b/sources index 3868637..0c5f3bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40edaba4d216915a8326c5b2cb52781d click-3.3.tar.gz +79b475a1dbd566d8ce7daba5e6c1aaa7 click-4.0.tar.gz From 88ee5028fc60fde02bbb6a142617ef2d63769072 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Sun, 31 May 2015 19:02:03 +0200 Subject: [PATCH 16/58] Rebuild for new fedora update --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index b19b909..6dd7d0a 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Sun May 31 2015 Robert Kuska - 4.0-2 +- Rebuilt + * Wed Apr 01 2015 Robert Kuska - 4.0-1 - Update to 4.0 From 5e546518a6d98dbf24c06a4d32e923436c3091cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 18:45:49 +0000 Subject: [PATCH 17/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 6dd7d0a..1e96eb4 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun May 31 2015 Robert Kuska - 4.0-2 - Rebuilt From 082fc9bbf7d2306462aeb13668d8137717598a6f Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 3 Aug 2015 15:52:28 +0200 Subject: [PATCH 18/58] Update to 4.1 --- .gitignore | 1 + python-click.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ea7d40..1cd5dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /click-3.2.tar.gz /click-3.3.tar.gz /click-4.0.tar.gz +/click-4.1.tar.gz diff --git a/python-click.spec b/python-click.spec index 1e96eb4..5f58f82 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,8 +3,8 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 4.0 -Release: 3%{?dist} +Version: 4.1 +Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Mon Aug 03 2015 Robert Kuska - 4.1-1 +- Update to 4.1 + * Thu Jun 18 2015 Fedora Release Engineering - 4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 0c5f3bb..fd41271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79b475a1dbd566d8ce7daba5e6c1aaa7 click-4.0.tar.gz +6a3fa88c738f2f775ec6de126feb99a4 click-4.1.tar.gz From a04f1fcb98c95741248a4afd52f6ba44c1dcb51f Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 24 Aug 2015 14:17:31 +0200 Subject: [PATCH 19/58] Update click to v5.1 --- .gitignore | 1 + python-click.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd5dcc..343f083 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /click-3.3.tar.gz /click-4.0.tar.gz /click-4.1.tar.gz +/click-5.1.tar.gz diff --git a/python-click.spec b/python-click.spec index 5f58f82..43bebe3 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,7 +3,7 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 4.1 +Version: 5.1 Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities @@ -95,6 +95,9 @@ popd %changelog +* Mon Aug 24 2015 Robert Kuska - 5.1-1 +- Update to 5.1 + * Mon Aug 03 2015 Robert Kuska - 4.1-1 - Update to 4.1 diff --git a/sources b/sources index fd41271..2c6c75a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a3fa88c738f2f775ec6de126feb99a4 click-4.1.tar.gz +9c5323008cccfe232a8b161fc8196d41 click-5.1.tar.gz From 41b3802c3a55dd05f7307f18cc147b4be4b8fb5d Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Wed, 14 Oct 2015 09:38:47 +0200 Subject: [PATCH 20/58] Rebuilt for Python3.5 rebuild --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 43bebe3..e02fdfa 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Wed Oct 14 2015 Robert Kuska - 5.1-2 +- Rebuilt for Python3.5 rebuild + * Mon Aug 24 2015 Robert Kuska - 5.1-1 - Update to 5.1 From ab8bed5b94970918624abab98b5c66d81b1b8f7d Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Tue, 19 Jan 2016 14:19:26 +0100 Subject: [PATCH 21/58] Update to 6.2 --- .gitignore | 1 + python-click.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 343f083..1c9e82c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /click-4.0.tar.gz /click-4.1.tar.gz /click-5.1.tar.gz +/click-6.2.tar.gz diff --git a/python-click.spec b/python-click.spec index e02fdfa..687f710 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,8 +3,8 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 5.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Tue Jan 19 2016 Robert Kuska - 6.2-1 +- Update to 6.2 + * Wed Oct 14 2015 Robert Kuska - 5.1-2 - Rebuilt for Python3.5 rebuild diff --git a/sources b/sources index 2c6c75a..98f25d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c5323008cccfe232a8b161fc8196d41 click-5.1.tar.gz +83252a8095397b1f5f710fdd58b484d9 click-6.2.tar.gz From 817bf6df84cdd3a9cfa09435af133dc3022fae04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 19:12:52 +0000 Subject: [PATCH 22/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 687f710..f00dd75 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 19 2016 Robert Kuska - 6.2-1 - Update to 6.2 From d84ba791f74f3a3658aca56f2c34bb43d3209784 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Tue, 8 Mar 2016 15:26:04 +0100 Subject: [PATCH 23/58] Update to 6.3 --- .gitignore | 1 + python-click.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1c9e82c..d0a846e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /click-4.1.tar.gz /click-5.1.tar.gz /click-6.2.tar.gz +/click-6.3.tar.gz diff --git a/python-click.spec b/python-click.spec index f00dd75..c37c13a 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,8 +3,8 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 6.2 -Release: 2%{?dist} +Version: 6.3 +Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Tue Mar 08 2016 Robert Kuska - 6.3-1 +- Update to 6.3 + * Thu Feb 04 2016 Fedora Release Engineering - 6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 98f25d7..24fb9b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83252a8095397b1f5f710fdd58b484d9 click-6.2.tar.gz +2f171cdf12b8f2e284c224825f5e4634 click-6.3.tar.gz From 468531123e41a760afb756c3b366a9ba274e71fa Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 18 Apr 2016 16:01:13 +0200 Subject: [PATCH 24/58] Update to version 6.6 --- .gitignore | 1 + ...-Change-exception-check-of-TypeError.patch | 25 ------------------- python-click.spec | 6 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 0001-Change-exception-check-of-TypeError.patch diff --git a/.gitignore b/.gitignore index d0a846e..96ca8f3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /click-5.1.tar.gz /click-6.2.tar.gz /click-6.3.tar.gz +/click-6.6.tar.gz diff --git a/0001-Change-exception-check-of-TypeError.patch b/0001-Change-exception-check-of-TypeError.patch deleted file mode 100644 index b263057..0000000 --- a/0001-Change-exception-check-of-TypeError.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1b7ea533ea79bacbb14979e92416fa03b22ee774 Mon Sep 17 00:00:00 2001 -From: Robert Kuska -Date: Sun, 24 Aug 2014 15:42:41 +0200 -Subject: [PATCH] Change exception check of TypeError - ---- - click/core.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/click/core.py b/click/core.py -index b4c7368..fd179a2 100644 ---- a/click/core.py -+++ b/click/core.py -@@ -432,7 +432,7 @@ class Context(object): - except TypeError as e: - if not injected_arguments: - raise -- if 'got multiple values for keyword argument' in str(e): -+ if 'got multiple values for' in str(e): - raise RuntimeError( - 'You called .invoke() on the context with a command ' - 'but provided parameters as positional arguments. ' --- -1.9.3 - diff --git a/python-click.spec b/python-click.spec index c37c13a..96a13ec 100644 --- a/python-click.spec +++ b/python-click.spec @@ -3,7 +3,7 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 6.3 +Version: 6.6 Release: 1%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities @@ -95,6 +95,10 @@ popd %changelog +* Mon Apr 18 2016 Charalampos Stratakis - 6.6-1 +- Update to 6.6 +- Removed non-applied patch file. + * Tue Mar 08 2016 Robert Kuska - 6.3-1 - Update to 6.3 diff --git a/sources b/sources index 24fb9b5..59c69b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f171cdf12b8f2e284c224825f5e4634 click-6.3.tar.gz +d0b09582123605220ad6977175f3e51d click-6.6.tar.gz From 5398fc8bd9dd40a8867a7b507bc50765d08b056e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 09:13:42 +0000 Subject: [PATCH 25/58] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 96a13ec..2267a81 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -95,6 +95,9 @@ popd %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 6.6-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Mon Apr 18 2016 Charalampos Stratakis - 6.6-1 - Update to 6.6 - Removed non-applied patch file. From a0871b610a45b4d65c0cd224b82f965b35076597 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 12 Dec 2016 16:03:30 +0100 Subject: [PATCH 26/58] Rebuild for Python 3.6 Disable python3 tests for now --- python-click.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/python-click.spec b/python-click.spec index 2267a81..c639226 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 6.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -19,7 +19,7 @@ BuildRequires: pytest %if %{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-pytest +#BuildRequires: python3-pytest %endif # if with_python3 @@ -77,9 +77,9 @@ popd %check PYTHONPATH=$(pwd) py.test-%{python2_version} tests --tb=long --verbose %if 0%{?with_python3} -pushd %{py3dir} -LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose -popd +#pushd %{py3dir} +#LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose +#popd %endif %files @@ -95,6 +95,10 @@ popd %changelog +* Fri Dec 09 2016 Charalampos Stratakis - 6.6-3 +- Rebuild for Python 3.6 +- Disable python3 tests for now + * Tue Jul 19 2016 Fedora Release Engineering - 6.6-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From b1f42e19350a47c84c4ba3f3456dbefe6e79bdf5 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Dec 2016 19:10:31 +0100 Subject: [PATCH 27/58] Enable tests --- python-click.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python-click.spec b/python-click.spec index c639226..317afaf 100644 --- a/python-click.spec +++ b/python-click.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 6.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A simple wrapper around optparse for powerful command line utilities License: BSD @@ -19,7 +19,7 @@ BuildRequires: pytest %if %{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -#BuildRequires: python3-pytest +BuildRequires: python3-pytest %endif # if with_python3 @@ -77,9 +77,9 @@ popd %check PYTHONPATH=$(pwd) py.test-%{python2_version} tests --tb=long --verbose %if 0%{?with_python3} -#pushd %{py3dir} -#LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose -#popd +pushd %{py3dir} +LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose +popd %endif %files @@ -95,6 +95,9 @@ PYTHONPATH=$(pwd) py.test-%{python2_version} tests --tb=long --verbose %changelog +* Tue Dec 13 2016 Charalampos Stratakis - 6.6-4 +- Enable tests + * Fri Dec 09 2016 Charalampos Stratakis - 6.6-3 - Rebuild for Python 3.6 - Disable python3 tests for now From 7be6fa8ae662d5586e025bcfa6fe82dfb56949d2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 7 Jan 2017 08:57:19 +0100 Subject: [PATCH 28/58] Update to 6.7; Adopt to packaging guidelines Signed-off-by: Igor Gnatenko --- .gitignore | 1 + python-click.spec | 124 +++++++++++++++++++--------------------------- sources | 2 +- 3 files changed, 54 insertions(+), 73 deletions(-) diff --git a/.gitignore b/.gitignore index 96ca8f3..3fb64ed 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /click-6.2.tar.gz /click-6.3.tar.gz /click-6.6.tar.gz +/click-6.7.tar.gz diff --git a/python-click.spec b/python-click.spec index 317afaf..5d7b35f 100644 --- a/python-click.spec +++ b/python-click.spec @@ -1,100 +1,80 @@ -# Created by pyp2rpm-1.0.1 %global pypi_name click -%global with_python3 1 Name: python-%{pypi_name} -Version: 6.6 -Release: 4%{?dist} -Summary: A simple wrapper around optparse for powerful command line utilities +Version: 6.7 +Release: 1%{?dist} +Summary: Simple wrapper around optparse for powerful command line utilities License: BSD -URL: http://github.com/mitsuhiko/click -Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +URL: https://github.com/mitsuhiko/click +Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz + BuildArch: noarch -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: pytest - -%if %{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pytest -%endif # if with_python3 - - -%description -click is a Python package for creating beautiful command line -interfaces in a composable way with as little amount of code as necessary. -It's the "Command Line Interface Creation Kit". It's highly configurable but +%global _description \ +click is a Python package for creating beautiful command line\ +interfaces in a composable way with as little amount of code as necessary.\ +It's the "Command Line Interface Creation Kit". It's highly configurable but\ comes with good defaults out of the box. -%if 0%{?with_python3} -%package -n python3-%{pypi_name} -Summary: A simple wrapper around optparse for powerful command line utilities +%description %{_description} +%package -n python2-%{pypi_name} +Summary: %{summary} +%{?python_provide:%python_provide python2-%{pypi_name}} +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pytest -%description -n python3-%{pypi_name} -click is a Python 3 package for creating beautiful command line -interfaces in a composable way with as little amount of code as necessary. -It's the "Command Line Interface Creation Kit". It's highly configurable but -comes with good defaults out of the box. -%endif # with_python3 +%description -n python2-%{pypi_name} %{_description} +Python 2 version. -%prep -%setup -q -n %{pypi_name}-%{version} +%package -n python3-%{pypi_name} +Summary: %{summary} +%{?python_provide:%python_provide python2-%{pypi_name}} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pytest -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} +%description -n python3-%{pypi_name} %{_description} -%endif # with_python3 +Python 3 version. +%prep +%autosetup -n %{pypi_name}-%{version} %build -%{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif # with_python3 - +%py2_build +%py3_build %install -# Must do the subpackages' install first because the scripts in /usr/bin are -# overwritten with every setup.py install (and we want the python2 version -# to be the default for now). -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} -popd -%endif # with_python3 - -%{__python2} setup.py install --skip-build --root %{buildroot} +%py2_install +%py3_install %check -PYTHONPATH=$(pwd) py.test-%{python2_version} tests --tb=long --verbose -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose -popd -%endif - -%files -%doc README -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%if 0%{?with_python3} -%files -n python3-%{pypi_name} -%doc README -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif # with_python3 +export PYTHONPATH=$(pwd) +export LC_ALL=C.UTF-8 +py.test-%{python2_version} tests --tb=long --verbose +py.test-%{python3_version} tests --tb=long --verbose +%files -n python2-%{pypi_name} +%license LICENSE +%doc README CHANGES +%{python2_sitelib}/%{pypi_name}-*.egg-info/ +%{python2_sitelib}/%{pypi_name}/ + +%files -n python3-%{pypi_name} +%license LICENSE +%doc README CHANGES +%{python3_sitelib}/%{pypi_name}-*.egg-info/ +%{python3_sitelib}/%{pypi_name}/ %changelog +* Sat Jan 07 2017 Igor Gnatenko - 6.7-1 +- Update to 6.7 +- Adopt to packaging guidelines + * Tue Dec 13 2016 Charalampos Stratakis - 6.6-4 - Enable tests diff --git a/sources b/sources index 59c69b2..f76a02c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0b09582123605220ad6977175f3e51d click-6.6.tar.gz +SHA512 (click-6.7.tar.gz) = 0d582ec4ecf8e4cf9ce2b9eec9d150e047512e1ebdb709eb031599c8e4a9632121dbb809bc1cfe597dd0ba62a9b8a5663c6dfbe41d575a991d27bca6b26130db From 9aa2a68ae0a9cc44158bdb00d13589459bee9965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Jan 2017 02:21:55 +0100 Subject: [PATCH 29/58] Fixed a copy-paste bug in %python_provide (rhbz#1411169) --- python-click.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-click.spec b/python-click.spec index 5d7b35f..1053669 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -32,7 +32,7 @@ Python 2 version. %package -n python3-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypi_name}} +%{?python_provide:%python_provide python3-%{pypi_name}} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pytest @@ -71,6 +71,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Mon Jan 09 2017 Miro Hrončok - 6.7-2 +- Fixed a copy-paste bug in %%python_provide (rhbz#1411169) + * Sat Jan 07 2017 Igor Gnatenko - 6.7-1 - Update to 6.7 - Adopt to packaging guidelines From 5ecb1ca785c1d69e9e8b0723f5242836ba1dcb80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 08:35:04 +0000 Subject: [PATCH 30/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 1053669..dd1a76e 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -71,6 +71,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 6.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 09 2017 Miro Hrončok - 6.7-2 - Fixed a copy-paste bug in %%python_provide (rhbz#1411169) From c7c22a384f7d6182fa9c94d348a3a8c68b1849a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 09:52:21 +0000 Subject: [PATCH 31/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index dd1a76e..ab23896 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -71,6 +71,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 6.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 6.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6364bd88350a6a96b5fcf1a978918d6f5881b863 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Oct 2017 17:49:59 +0200 Subject: [PATCH 32/58] Fix FTBFS Signed-off-by: Igor Gnatenko --- ...ove-outdated-comment-about-Click-3.0.patch | 24 +++++++++ ...ytest-option-to-not-capture-warnings.patch | 21 ++++++++ 0003-Catch-and-test-pytest-warning.patch | 54 +++++++++++++++++++ python-click.spec | 12 ++++- 4 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 0001-Remove-outdated-comment-about-Click-3.0.patch create mode 100644 0002-Add-pytest-option-to-not-capture-warnings.patch create mode 100644 0003-Catch-and-test-pytest-warning.patch diff --git a/0001-Remove-outdated-comment-about-Click-3.0.patch b/0001-Remove-outdated-comment-about-Click-3.0.patch new file mode 100644 index 0000000..bd5bdd9 --- /dev/null +++ b/0001-Remove-outdated-comment-about-Click-3.0.patch @@ -0,0 +1,24 @@ +From 4fa671b4afdde8e103a03b39dcdc66e1a10a16fa Mon Sep 17 00:00:00 2001 +From: Adam Dangoor +Date: Mon, 31 Jul 2017 17:58:41 +0100 +Subject: [PATCH 1/3] Remove outdated comment about Click 3.0 + +--- + click/core.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/click/core.py b/click/core.py +index 7456451..18fa9a5 100644 +--- a/click/core.py ++++ b/click/core.py +@@ -68,7 +68,6 @@ def invoke_param_callback(callback, ctx, param, value): + args = getattr(code, 'co_argcount', 3) + + if args < 3: +- # This will become a warning in Click 3.0: + from warnings import warn + warn(Warning('Invoked legacy parameter callback "%s". The new ' + 'signature for such callbacks starting with ' +-- +2.14.2 + diff --git a/0002-Add-pytest-option-to-not-capture-warnings.patch b/0002-Add-pytest-option-to-not-capture-warnings.patch new file mode 100644 index 0000000..ed34f7b --- /dev/null +++ b/0002-Add-pytest-option-to-not-capture-warnings.patch @@ -0,0 +1,21 @@ +From 6e7951c511b8316a73d9a8d9c4cc130becd99e93 Mon Sep 17 00:00:00 2001 +From: Adam Dangoor +Date: Mon, 31 Jul 2017 18:06:20 +0100 +Subject: [PATCH 2/3] Add pytest option to not capture warnings + +--- + pytest.ini | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 pytest.ini + +diff --git a/pytest.ini b/pytest.ini +new file mode 100644 +index 0000000..1ceab94 +--- /dev/null ++++ b/pytest.ini +@@ -0,0 +1,2 @@ ++[pytest] ++addopts = -p no:warnings +-- +2.14.2 + diff --git a/0003-Catch-and-test-pytest-warning.patch b/0003-Catch-and-test-pytest-warning.patch new file mode 100644 index 0000000..ab8609b --- /dev/null +++ b/0003-Catch-and-test-pytest-warning.patch @@ -0,0 +1,54 @@ +From e6fb0fe8bc75e7931fe86e95442eec09b49caee7 Mon Sep 17 00:00:00 2001 +From: Adam Dangoor +Date: Mon, 31 Jul 2017 19:45:24 +0100 +Subject: [PATCH 3/3] Catch and test pytest warning + +--- + pytest.ini | 2 -- + tests/test_compat.py | 15 +++++++++++++-- + 2 files changed, 13 insertions(+), 4 deletions(-) + delete mode 100644 pytest.ini + +diff --git a/pytest.ini b/pytest.ini +deleted file mode 100644 +index 1ceab94..0000000 +--- a/pytest.ini ++++ /dev/null +@@ -1,2 +0,0 @@ +-[pytest] +-addopts = -p no:warnings +diff --git a/tests/test_compat.py b/tests/test_compat.py +index e4ecdc8..d86110a 100644 +--- a/tests/test_compat.py ++++ b/tests/test_compat.py +@@ -1,3 +1,5 @@ ++import pytest ++ + import click + + +@@ -11,10 +13,19 @@ if click.__version__ >= '3.0': + def cli(foo): + click.echo(foo) + +- result = runner.invoke(cli, ['--foo', 'wat']) ++ with pytest.warns(Warning) as records: ++ result = runner.invoke(cli, ['--foo', 'wat']) ++ ++ [warning_record] = records ++ warning_message = str(warning_record.message) ++ assert 'Invoked legacy parameter callback' in warning_message + assert result.exit_code == 0 ++ # Depending on the pytest version, the warning message may be ++ # in `result.output`. ++ # ++ # In pytest version 3.1 pytest started capturing warnings by default. ++ # See https://docs.pytest.org/en/latest/warnings.html#warnings-capture. + assert 'WAT' in result.output +- assert 'Invoked legacy parameter callback' in result.output + + + def test_bash_func_name(): +-- +2.14.2 + diff --git a/python-click.spec b/python-click.spec index ab23896..ad110f0 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,12 +2,17 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD URL: https://github.com/mitsuhiko/click Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz +# https://bugzilla.redhat.com/show_bug.cgi?id=1500962 +# https://github.com/pallets/click/pull/838 +Patch0: 0001-Remove-outdated-comment-about-Click-3.0.patch +Patch1: 0002-Add-pytest-option-to-not-capture-warnings.patch +Patch2: 0003-Catch-and-test-pytest-warning.patch BuildArch: noarch @@ -42,7 +47,7 @@ BuildRequires: python3-pytest Python 3 version. %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -n %{pypi_name}-%{version} -p1 %build %py2_build @@ -71,6 +76,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Oct 12 2017 Igor Gnatenko - 6.7-5 +- Fix FTBFS + * Thu Jul 27 2017 Fedora Release Engineering - 6.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bac27b622726d2a526b3fbcae2732db269ee723b Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 12 Oct 2017 16:08:28 -0500 Subject: [PATCH 33/58] Add EPEL compatibility --- python-click.spec | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/python-click.spec b/python-click.spec index ad110f0..eefa004 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -15,7 +15,7 @@ Patch1: 0002-Add-pytest-option-to-not-capture-warnings.patch Patch2: 0003-Catch-and-test-pytest-warning.patch BuildArch: noarch - + %global _description \ click is a Python package for creating beautiful command line\ interfaces in a composable way with as little amount of code as necessary.\ @@ -28,21 +28,24 @@ comes with good defaults out of the box. Summary: %{summary} %{?python_provide:%python_provide python2-%{pypi_name}} BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pytest +BuildRequires: python%{?fedora:2}-setuptools +%if %{undefined rhel} +# pytest in base RHEL is too old, we'll skip the tests there +BuildRequires: python2-pytest >= 2.8 +%endif %description -n python2-%{pypi_name} %{_description} Python 2 version. -%package -n python3-%{pypi_name} +%package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pytest +%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-pytest >= 2.8 -%description -n python3-%{pypi_name} %{_description} +%description -n python%{python3_pkgversion}-%{pypi_name} %{_description} Python 3 version. @@ -59,8 +62,11 @@ Python 3 version. %check export PYTHONPATH=$(pwd) -export LC_ALL=C.UTF-8 +export LC_ALL=en_US.UTF-8 +%if %{undefined rhel} +# pytest in base RHEL is too old, we'll skip the tests there py.test-%{python2_version} tests --tb=long --verbose +%endif py.test-%{python3_version} tests --tb=long --verbose %files -n python2-%{pypi_name} @@ -69,13 +75,16 @@ py.test-%{python3_version} tests --tb=long --verbose %{python2_sitelib}/%{pypi_name}-*.egg-info/ %{python2_sitelib}/%{pypi_name}/ -%files -n python3-%{pypi_name} +%files -n python%{python3_pkgversion}-%{pypi_name} %license LICENSE %doc README CHANGES %{python3_sitelib}/%{pypi_name}-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Oct 12 2017 Carl George - 6.7-6 +- Add EPEL compatibility + * Thu Oct 12 2017 Igor Gnatenko - 6.7-5 - Fix FTBFS From a50c5d0012b5434d1cd1accc6572f32caa48e873 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Oct 2017 23:37:15 +0200 Subject: [PATCH 34/58] Fixup EPEL packaging Signed-off-by: Igor Gnatenko --- python-click.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python-click.spec b/python-click.spec index eefa004..be00609 100644 --- a/python-click.spec +++ b/python-click.spec @@ -28,10 +28,12 @@ comes with good defaults out of the box. Summary: %{summary} %{?python_provide:%python_provide python2-%{pypi_name}} BuildRequires: python2-devel -BuildRequires: python%{?fedora:2}-setuptools -%if %{undefined rhel} +%if ! (0%{?rhel} && 0%{?rhel} <= 7) +BuildRequires: python2-setuptools # pytest in base RHEL is too old, we'll skip the tests there BuildRequires: python2-pytest >= 2.8 +%else +BuildRequires: python-setuptools %endif %description -n python2-%{pypi_name} %{_description} @@ -63,7 +65,7 @@ Python 3 version. %check export PYTHONPATH=$(pwd) export LC_ALL=en_US.UTF-8 -%if %{undefined rhel} +%if ! (0%{?rhel} && 0%{?rhel} <= 7) # pytest in base RHEL is too old, we'll skip the tests there py.test-%{python2_version} tests --tb=long --verbose %endif @@ -82,6 +84,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Oct 12 2017 Igor Gnatenko - 6.7-6 +- Fixup EPEL packaging + * Thu Oct 12 2017 Carl George - 6.7-6 - Add EPEL compatibility From e2ad64217a93eb2602644611bc7ecb5a43116465 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 07:04:32 +0000 Subject: [PATCH 35/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index be00609..ae6e765 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -84,6 +84,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 6.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Oct 12 2017 Igor Gnatenko - 6.7-6 - Fixup EPEL packaging From ecb9cc84e8f12333fcf07a8689b303179a4ec339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 15 Jun 2018 17:52:12 +0200 Subject: [PATCH 36/58] Rebuilt for Python 3.7 --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index ae6e765..a1cb882 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -84,6 +84,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Fri Jun 15 2018 Miro Hrončok - 6.7-8 +- Rebuilt for Python 3.7 + * Fri Feb 09 2018 Fedora Release Engineering - 6.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b588e539a948c846958e16a39343a98302950ff9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 23:46:59 +0000 Subject: [PATCH 37/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index a1cb882..a23f1b7 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -84,6 +84,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 6.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 15 2018 Miro Hrončok - 6.7-8 - Rebuilt for Python 3.7 From 704cf5318e5a8b104305c5b1f264a80dd0395bef Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 2 Oct 2018 17:56:02 +0200 Subject: [PATCH 38/58] Update to 7.0 Resolves: rhbz#1634210 --- .gitignore | 1 + ...ytest-option-to-not-capture-warnings.patch | 21 -------- 0003-Catch-and-test-pytest-warning.patch | 54 ------------------- python-click.spec | 21 ++++---- sources | 2 +- 5 files changed, 13 insertions(+), 86 deletions(-) delete mode 100644 0002-Add-pytest-option-to-not-capture-warnings.patch delete mode 100644 0003-Catch-and-test-pytest-warning.patch diff --git a/.gitignore b/.gitignore index 3fb64ed..ce74953 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /click-6.3.tar.gz /click-6.6.tar.gz /click-6.7.tar.gz +/click-7.0.tar.gz diff --git a/0002-Add-pytest-option-to-not-capture-warnings.patch b/0002-Add-pytest-option-to-not-capture-warnings.patch deleted file mode 100644 index ed34f7b..0000000 --- a/0002-Add-pytest-option-to-not-capture-warnings.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 6e7951c511b8316a73d9a8d9c4cc130becd99e93 Mon Sep 17 00:00:00 2001 -From: Adam Dangoor -Date: Mon, 31 Jul 2017 18:06:20 +0100 -Subject: [PATCH 2/3] Add pytest option to not capture warnings - ---- - pytest.ini | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 pytest.ini - -diff --git a/pytest.ini b/pytest.ini -new file mode 100644 -index 0000000..1ceab94 ---- /dev/null -+++ b/pytest.ini -@@ -0,0 +1,2 @@ -+[pytest] -+addopts = -p no:warnings --- -2.14.2 - diff --git a/0003-Catch-and-test-pytest-warning.patch b/0003-Catch-and-test-pytest-warning.patch deleted file mode 100644 index ab8609b..0000000 --- a/0003-Catch-and-test-pytest-warning.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e6fb0fe8bc75e7931fe86e95442eec09b49caee7 Mon Sep 17 00:00:00 2001 -From: Adam Dangoor -Date: Mon, 31 Jul 2017 19:45:24 +0100 -Subject: [PATCH 3/3] Catch and test pytest warning - ---- - pytest.ini | 2 -- - tests/test_compat.py | 15 +++++++++++++-- - 2 files changed, 13 insertions(+), 4 deletions(-) - delete mode 100644 pytest.ini - -diff --git a/pytest.ini b/pytest.ini -deleted file mode 100644 -index 1ceab94..0000000 ---- a/pytest.ini -+++ /dev/null -@@ -1,2 +0,0 @@ --[pytest] --addopts = -p no:warnings -diff --git a/tests/test_compat.py b/tests/test_compat.py -index e4ecdc8..d86110a 100644 ---- a/tests/test_compat.py -+++ b/tests/test_compat.py -@@ -1,3 +1,5 @@ -+import pytest -+ - import click - - -@@ -11,10 +13,19 @@ if click.__version__ >= '3.0': - def cli(foo): - click.echo(foo) - -- result = runner.invoke(cli, ['--foo', 'wat']) -+ with pytest.warns(Warning) as records: -+ result = runner.invoke(cli, ['--foo', 'wat']) -+ -+ [warning_record] = records -+ warning_message = str(warning_record.message) -+ assert 'Invoked legacy parameter callback' in warning_message - assert result.exit_code == 0 -+ # Depending on the pytest version, the warning message may be -+ # in `result.output`. -+ # -+ # In pytest version 3.1 pytest started capturing warnings by default. -+ # See https://docs.pytest.org/en/latest/warnings.html#warnings-capture. - assert 'WAT' in result.output -- assert 'Invoked legacy parameter callback' in result.output - - - def test_bash_func_name(): --- -2.14.2 - diff --git a/python-click.spec b/python-click.spec index a23f1b7..c6e4add 100644 --- a/python-click.spec +++ b/python-click.spec @@ -1,8 +1,8 @@ %global pypi_name click Name: python-%{pypi_name} -Version: 6.7 -Release: 9%{?dist} +Version: 7.0 +Release: 1%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -11,8 +11,6 @@ Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=1500962 # https://github.com/pallets/click/pull/838 Patch0: 0001-Remove-outdated-comment-about-Click-3.0.patch -Patch1: 0002-Add-pytest-option-to-not-capture-warnings.patch -Patch2: 0003-Catch-and-test-pytest-warning.patch BuildArch: noarch @@ -72,18 +70,21 @@ py.test-%{python2_version} tests --tb=long --verbose py.test-%{python3_version} tests --tb=long --verbose %files -n python2-%{pypi_name} -%license LICENSE -%doc README CHANGES -%{python2_sitelib}/%{pypi_name}-*.egg-info/ +%license LICENSE.rst +%doc README.rst CHANGES.rst +%{python2_sitelib}/Click-*.egg-info/ %{python2_sitelib}/%{pypi_name}/ %files -n python%{python3_pkgversion}-%{pypi_name} -%license LICENSE -%doc README CHANGES -%{python3_sitelib}/%{pypi_name}-*.egg-info/ +%license LICENSE.rst +%doc README.rst CHANGES.rst +%{python3_sitelib}/Click-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ %changelog +* Tue Oct 02 2018 Charalampos Stratakis - 7.0-1 +- Update to 7.0 + * Fri Jul 13 2018 Fedora Release Engineering - 6.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index f76a02c..967142e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (click-6.7.tar.gz) = 0d582ec4ecf8e4cf9ce2b9eec9d150e047512e1ebdb709eb031599c8e4a9632121dbb809bc1cfe597dd0ba62a9b8a5663c6dfbe41d575a991d27bca6b26130db +SHA512 (click-7.0.tar.gz) = 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a From 68b39ee28b8ea7f2955eebfaf95b8d8aa5f7c219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 18 Nov 2018 19:16:33 +0100 Subject: [PATCH 39/58] Drop explicit locale setting Python3 now sets unicode locale automatically, this workaround should not be necessary anymore. --- python-click.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-click.spec b/python-click.spec index c6e4add..449febc 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -62,7 +62,6 @@ Python 3 version. %check export PYTHONPATH=$(pwd) -export LC_ALL=en_US.UTF-8 %if ! (0%{?rhel} && 0%{?rhel} <= 7) # pytest in base RHEL is too old, we'll skip the tests there py.test-%{python2_version} tests --tb=long --verbose @@ -82,6 +81,10 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 7.0-2 +- Drop explicit locale setting + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + * Tue Oct 02 2018 Charalampos Stratakis - 7.0-1 - Update to 7.0 From cf7c963be4f22aa5d36fef3561aa6246b43a7ec5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 06:05:01 +0000 Subject: [PATCH 40/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 449febc..184edc5 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -81,6 +81,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 7.0-2 - Drop explicit locale setting See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot From ebe8270f89541275be6396a4c5931711597a442e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 12:39:44 +0000 Subject: [PATCH 41/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 184edc5..d8c6b8a 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -81,6 +81,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 35af0acb8eb0d074ce18e84459283dc77e412eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 23:14:05 +0200 Subject: [PATCH 42/58] Rebuilt for Python 3.8 --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index d8c6b8a..226580d 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -81,6 +81,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Aug 15 2019 Miro Hrončok - 7.0-5 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b9a71aa64061fdad1d87948deca2968a1a65487c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 18 Sep 2019 17:41:06 +0200 Subject: [PATCH 43/58] Subpackage python2-click has been removed --- python-click.spec | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/python-click.spec b/python-click.spec index 226580d..5585894 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -22,22 +22,6 @@ comes with good defaults out of the box. %description %{_description} -%package -n python2-%{pypi_name} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypi_name}} -BuildRequires: python2-devel -%if ! (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: python2-setuptools -# pytest in base RHEL is too old, we'll skip the tests there -BuildRequires: python2-pytest >= 2.8 -%else -BuildRequires: python-setuptools -%endif - -%description -n python2-%{pypi_name} %{_description} - -Python 2 version. - %package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} @@ -53,27 +37,15 @@ Python 3 version. %autosetup -n %{pypi_name}-%{version} -p1 %build -%py2_build %py3_build %install -%py2_install %py3_install %check export PYTHONPATH=$(pwd) -%if ! (0%{?rhel} && 0%{?rhel} <= 7) -# pytest in base RHEL is too old, we'll skip the tests there -py.test-%{python2_version} tests --tb=long --verbose -%endif py.test-%{python3_version} tests --tb=long --verbose -%files -n python2-%{pypi_name} -%license LICENSE.rst -%doc README.rst CHANGES.rst -%{python2_sitelib}/Click-*.egg-info/ -%{python2_sitelib}/%{pypi_name}/ - %files -n python%{python3_pkgversion}-%{pypi_name} %license LICENSE.rst %doc README.rst CHANGES.rst @@ -81,6 +53,10 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Wed Sep 18 2019 Miro Hrončok - 7.0-6 +- Subpackage python2-click has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Thu Aug 15 2019 Miro Hrončok - 7.0-5 - Rebuilt for Python 3.8 From 8a46f05127cb6d53feaa26a648ba0fef8f6b0d62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 11:11:32 +0000 Subject: [PATCH 44/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 5585894..07fd7e7 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -53,6 +53,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Sep 18 2019 Miro Hrončok - 7.0-6 - Subpackage python2-click has been removed See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal From f51f9f3df34dc66f23c38888f5f0b765f9f08d5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Apr 2020 14:16:22 +0200 Subject: [PATCH 45/58] * Sat Apr 18 2020 Fabian Affolter - 7.1.1-1 - Update to latest upstream release 7.1.1 (rhbz#1811727) --- .gitignore | 1 + python-click.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ce74953..953af87 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /click-6.6.tar.gz /click-6.7.tar.gz /click-7.0.tar.gz +/click-7.1.1.tar.gz diff --git a/python-click.spec b/python-click.spec index 07fd7e7..ce7555c 100644 --- a/python-click.spec +++ b/python-click.spec @@ -1,8 +1,8 @@ %global pypi_name click Name: python-%{pypi_name} -Version: 7.0 -Release: 7%{?dist} +Version: 7.1.1 +Release: 1%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -53,6 +53,9 @@ py.test-%{python3_version} tests --tb=long --verbose %{python3_sitelib}/%{pypi_name}/ %changelog +* Sat Apr 18 2020 Fabian Affolter - 7.1.1-1 +- Update to latest upstream release 7.1.1 (rhbz#1811727) + * Thu Jan 30 2020 Fedora Release Engineering - 7.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 967142e..7669933 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (click-7.0.tar.gz) = 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a +SHA512 (click-7.1.1.tar.gz) = 955dd75569a7179c204971b868ca17c666bddbaa84201d2b23fbf53ccbd35878c1d638cf70d5c42c2785276fea0cf1f1c062ff990c5869736d6cba0d9fca1486 From b20f65587ab84c32312333274d0a81c603984c7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Apr 2020 14:22:30 +0200 Subject: [PATCH 46/58] Remove obsolete parts --- python-click.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/python-click.spec b/python-click.spec index ce7555c..2bbc41b 100644 --- a/python-click.spec +++ b/python-click.spec @@ -8,10 +8,6 @@ Summary: Simple wrapper around optparse for powerful command line utiliti License: BSD URL: https://github.com/mitsuhiko/click Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz -# https://bugzilla.redhat.com/show_bug.cgi?id=1500962 -# https://github.com/pallets/click/pull/838 -Patch0: 0001-Remove-outdated-comment-about-Click-3.0.patch - BuildArch: noarch %global _description \ @@ -27,12 +23,10 @@ Summary: %{summary} %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-pytest >= 2.8 +BuildRequires: python%{python3_pkgversion}-pytest %description -n python%{python3_pkgversion}-%{pypi_name} %{_description} -Python 3 version. - %prep %autosetup -n %{pypi_name}-%{version} -p1 @@ -43,14 +37,13 @@ Python 3 version. %py3_install %check -export PYTHONPATH=$(pwd) -py.test-%{python3_version} tests --tb=long --verbose +PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests %files -n python%{python3_pkgversion}-%{pypi_name} %license LICENSE.rst %doc README.rst CHANGES.rst -%{python3_sitelib}/Click-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ +%{python3_sitelib}/%{pypi_name}-*.egg-info/ %changelog * Sat Apr 18 2020 Fabian Affolter - 7.1.1-1 From c1d142ef7b446a5c570fc6e5b641ecde8b30f006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 21 Apr 2020 18:21:48 +0200 Subject: [PATCH 47/58] Remove unused patch See b20f65587ab84c32312333274d0a81c603984c7e --- ...ove-outdated-comment-about-Click-3.0.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 0001-Remove-outdated-comment-about-Click-3.0.patch diff --git a/0001-Remove-outdated-comment-about-Click-3.0.patch b/0001-Remove-outdated-comment-about-Click-3.0.patch deleted file mode 100644 index bd5bdd9..0000000 --- a/0001-Remove-outdated-comment-about-Click-3.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4fa671b4afdde8e103a03b39dcdc66e1a10a16fa Mon Sep 17 00:00:00 2001 -From: Adam Dangoor -Date: Mon, 31 Jul 2017 17:58:41 +0100 -Subject: [PATCH 1/3] Remove outdated comment about Click 3.0 - ---- - click/core.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/click/core.py b/click/core.py -index 7456451..18fa9a5 100644 ---- a/click/core.py -+++ b/click/core.py -@@ -68,7 +68,6 @@ def invoke_param_callback(callback, ctx, param, value): - args = getattr(code, 'co_argcount', 3) - - if args < 3: -- # This will become a warning in Click 3.0: - from warnings import warn - warn(Warning('Invoked legacy parameter callback "%s". The new ' - 'signature for such callbacks starting with ' --- -2.14.2 - From 287743061a09e7baa2890d664def41bb14559681 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Apr 2020 17:58:10 +0200 Subject: [PATCH 48/58] * Tue Apr 28 2020 Fabian Affolter - 7.1.2-1 - Update to latest upstream release 7.1.2 (rhbz#1828589) --- .gitignore | 1 + python-click.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 953af87..4d21417 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /click-6.7.tar.gz /click-7.0.tar.gz /click-7.1.1.tar.gz +/click-7.1.2.tar.gz diff --git a/python-click.spec b/python-click.spec index 2bbc41b..6389d0a 100644 --- a/python-click.spec +++ b/python-click.spec @@ -1,7 +1,7 @@ %global pypi_name click Name: python-%{pypi_name} -Version: 7.1.1 +Version: 7.1.2 Release: 1%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities @@ -46,6 +46,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests %{python3_sitelib}/%{pypi_name}-*.egg-info/ %changelog +* Tue Apr 28 2020 Fabian Affolter - 7.1.2-1 +- Update to latest upstream release 7.1.2 (rhbz#1828589) + * Sat Apr 18 2020 Fabian Affolter - 7.1.1-1 - Update to latest upstream release 7.1.1 (rhbz#1811727) diff --git a/sources b/sources index 7669933..4fb07bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (click-7.1.1.tar.gz) = 955dd75569a7179c204971b868ca17c666bddbaa84201d2b23fbf53ccbd35878c1d638cf70d5c42c2785276fea0cf1f1c062ff990c5869736d6cba0d9fca1486 +SHA512 (click-7.1.2.tar.gz) = d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba From 0253de2823288300f3e1fc7b67358bb2ecc7e7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 01:31:04 +0200 Subject: [PATCH 49/58] Rebuilt for Python 3.9 --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 6389d0a..d700adb 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -46,6 +46,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests %{python3_sitelib}/%{pypi_name}-*.egg-info/ %changelog +* Fri May 22 2020 Miro Hrončok - 7.1.2-2 +- Rebuilt for Python 3.9 + * Tue Apr 28 2020 Fabian Affolter - 7.1.2-1 - Update to latest upstream release 7.1.2 (rhbz#1828589) From 46162eb21aaeef9c58a619f2c220c5d2e80b06a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 00:10:01 +0000 Subject: [PATCH 50/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index d700adb..048f04a 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -46,6 +46,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests %{python3_sitelib}/%{pypi_name}-*.egg-info/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 7.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri May 22 2020 Miro Hrončok - 7.1.2-2 - Rebuilt for Python 3.9 From bcf53961462c4c9f92cc19b72d6cfce91dcf1b20 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Fri, 11 Sep 2020 14:20:02 +0200 Subject: [PATCH 51/58] Convert the package to pyproject macros Modernize the SPEC: Remove the python_provide macro Utilize the %tox macro in %check --- python-click.spec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/python-click.spec b/python-click.spec index 048f04a..a246c44 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -20,32 +20,36 @@ comes with good defaults out of the box. %package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} + BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: pyproject-rpm-macros %description -n python%{python3_pkgversion}-%{pypi_name} %{_description} %prep %autosetup -n %{pypi_name}-%{version} -p1 +%generate_buildrequires +%pyproject_buildrequires -t + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files %{pypi_name} %check -PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests +%tox -%files -n python%{python3_pkgversion}-%{pypi_name} +%files -n python%{python3_pkgversion}-%{pypi_name} -f %pyproject_files %license LICENSE.rst %doc README.rst CHANGES.rst -%{python3_sitelib}/%{pypi_name}/ -%{python3_sitelib}/%{pypi_name}-*.egg-info/ %changelog +* Fri Sep 11 2020 Charalampos Stratakis - 7.1.2-4 +- Modernize the SPEC and convert it to pyproject macros + * Wed Jul 29 2020 Fedora Release Engineering - 7.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ab9791ee6964cbe3b5ae80f9ef987439667347d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 09:49:04 +0000 Subject: [PATCH 52/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index a246c44..fc400a2 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -47,6 +47,9 @@ BuildRequires: pyproject-rpm-macros %doc README.rst CHANGES.rst %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 7.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Sep 11 2020 Charalampos Stratakis - 7.1.2-4 - Modernize the SPEC and convert it to pyproject macros From d1ef24626d0cd6588ce3744da2377ebbe4d8567e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 16:53:31 +0200 Subject: [PATCH 53/58] Rebuilt for Python 3.10 --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index fc400a2..f635145 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 7.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -47,6 +47,9 @@ BuildRequires: pyproject-rpm-macros %doc README.rst CHANGES.rst %changelog +* Wed Jun 02 2021 Python Maint - 7.1.2-6 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 7.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e05a6ab4822a9cf1d2b40d35f14512bc616df15c Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 20 May 2021 09:15:21 +0200 Subject: [PATCH 54/58] Run pipenv tests on package update --- .fmf/version | 1 + plans/pipenv.fmf | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/pipenv.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/pipenv.fmf b/plans/pipenv.fmf new file mode 100644 index 0000000..8f1a535 --- /dev/null +++ b/plans/pipenv.fmf @@ -0,0 +1,7 @@ +summary: Run pipenv tests +discover: + how: fmf + url: https://src.fedoraproject.org/rpms/pipenv/ +execute: + how: tmt + From 15c2eeba3e83070f67b76813bbe7d657d1dd055a Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 22 Jun 2021 14:13:26 +0200 Subject: [PATCH 55/58] Update to 8.0.1 and remove tests from pipenv Click will be bundled back to pipenv so we don't have to test it here anymore. --- .fmf/version | 1 - .gitignore | 1 + plans/pipenv.fmf | 7 ------- python-click.spec | 8 ++++++-- sources | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 .fmf/version delete mode 100644 plans/pipenv.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 4d21417..a09dae2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /click-7.0.tar.gz /click-7.1.1.tar.gz /click-7.1.2.tar.gz +/click-8.0.1.tar.gz diff --git a/plans/pipenv.fmf b/plans/pipenv.fmf deleted file mode 100644 index 8f1a535..0000000 --- a/plans/pipenv.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run pipenv tests -discover: - how: fmf - url: https://src.fedoraproject.org/rpms/pipenv/ -execute: - how: tmt - diff --git a/python-click.spec b/python-click.spec index f635145..65b773a 100644 --- a/python-click.spec +++ b/python-click.spec @@ -1,8 +1,8 @@ %global pypi_name click Name: python-%{pypi_name} -Version: 7.1.2 -Release: 6%{?dist} +Version: 8.0.1 +Release: 1%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -47,6 +47,10 @@ BuildRequires: pyproject-rpm-macros %doc README.rst CHANGES.rst %changelog +* Tue Jun 22 2021 Lumír Balhar - 8.0.1-1 +- Update to 8.0.1 +Resolves: rhbz#1901659 + * Wed Jun 02 2021 Python Maint - 7.1.2-6 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 4fb07bf..39ea162 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (click-7.1.2.tar.gz) = d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba +SHA512 (click-8.0.1.tar.gz) = d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032 From 230d1a3c7fe70f87f330d850a673b0674a671079 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 8 Jul 2021 06:36:22 +0200 Subject: [PATCH 56/58] Use test dependencies without version locks --- python-click.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 65b773a..901ea49 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 8.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -28,6 +28,8 @@ BuildRequires: pyproject-rpm-macros %prep %autosetup -n %{pypi_name}-%{version} -p1 +# Use test dependencies without version locks +sed -i 's|requirements/tests.txt|requirements/tests.in|' tox.ini %generate_buildrequires %pyproject_buildrequires -t @@ -47,6 +49,9 @@ BuildRequires: pyproject-rpm-macros %doc README.rst CHANGES.rst %changelog +* Thu Jul 08 2021 Lumír Balhar - 8.0.1-2 +- Use test dependencies without version locks + * Tue Jun 22 2021 Lumír Balhar - 8.0.1-1 - Update to 8.0.1 Resolves: rhbz#1901659 From ad6d1d9dd0d5157f184ceaf1d13a6840f054e3e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 05:37:33 +0000 Subject: [PATCH 57/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-click.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-click.spec b/python-click.spec index 901ea49..0c4bd5f 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 8.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -49,6 +49,9 @@ sed -i 's|requirements/tests.txt|requirements/tests.in|' tox.ini %doc README.rst CHANGES.rst %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 8.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 08 2021 Lumír Balhar - 8.0.1-2 - Use test dependencies without version locks From 1cb503ea9aace45ab1b1083ea73e61e4cd0fa835 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 5 Nov 2021 10:04:58 +0100 Subject: [PATCH 58/58] Update to 8.0.3 --- .gitignore | 1 + python-click.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a09dae2..496f21a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /click-7.1.1.tar.gz /click-7.1.2.tar.gz /click-8.0.1.tar.gz +/click-8.0.3.tar.gz diff --git a/python-click.spec b/python-click.spec index 0c4bd5f..bede637 100644 --- a/python-click.spec +++ b/python-click.spec @@ -1,8 +1,8 @@ %global pypi_name click Name: python-%{pypi_name} -Version: 8.0.1 -Release: 3%{?dist} +Version: 8.0.3 +Release: 1%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -49,6 +49,10 @@ sed -i 's|requirements/tests.txt|requirements/tests.in|' tox.ini %doc README.rst CHANGES.rst %changelog +* Fri Nov 05 2021 Karolina Surma - 8.0.3-1 +- Update to 8.0.3 +Resolves: rhbz#2012353 + * Fri Jul 23 2021 Fedora Release Engineering - 8.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 39ea162..08b0c77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (click-8.0.1.tar.gz) = d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032 +SHA512 (click-8.0.3.tar.gz) = 73d29b73d5f90132282753fa1b53f42a690ebf713e8e4f2e3ff3c8820ef71ed82c5165bf61563341170a263c4202adb5690540fdeb6501fb9d81d2db06a5e89e