From 2d72d2f145116e45a82e5695e6e2bb602c2cd271 Mon Sep 17 00:00:00 2001 From: Silas Sewell Date: Nov 01 2010 20:01:25 +0000 Subject: [PATCH 1/55] Initial import --- diff --git a/.gitignore b/.gitignore index e69de29..9ff9656 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/redis-2.0.0.tar.gz diff --git a/python-redis.spec b/python-redis.spec new file mode 100644 index 0000000..0e249a1 --- /dev/null +++ b/python-redis.spec @@ -0,0 +1,43 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +%global upstream_name redis + +Name: python-%{upstream_name} +Version: 2.0.0 +Release: 1%{?dist} +Summary: A Python client for redis + +Group: Development/Languages +License: MIT +URL: http://github.com/andymccurdy/redis-py +Source0: http://github.com/downloads/andymccurdy/redis-py/%{upstream_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: python-devel + +%description +This is a Python interface to the Redis key-value store. + +%prep +%setup -q -n %{upstream_name}-%{version} + +%build +%{__python} setup.py build + +%install +rm -rf %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc CHANGES LICENSE README.md +%{python_sitelib}/%{upstream_name} +%{python_sitelib}/%{upstream_name}-%{version}-*.egg-info + +%changelog +* Sat Sep 04 2010 Silas Sewell - 2.0.0-1 +- Initial build diff --git a/sources b/sources index e69de29..aeaa933 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +a77497d026885ed9c467a28e2d00388d redis-2.0.0.tar.gz From 09c26e8bcf3f9b65d313034178fc735a20941b2a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 09 2011 06:08:00 +0000 Subject: [PATCH 2/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index 0e249a1..1067828 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -4,7 +4,7 @@ Name: python-%{upstream_name} Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python client for redis Group: Development/Languages @@ -39,5 +39,8 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Sep 04 2010 Silas Sewell - 2.0.0-1 - Initial build From 3dd895c7fe0e6eef084f1153f3fabd0d2ae00ce1 Mon Sep 17 00:00:00 2001 From: Silas Sewell Date: Mar 28 2011 03:16:51 +0000 Subject: [PATCH 3/55] Update to 2.2.4 --- diff --git a/.gitignore b/.gitignore index 9ff9656..04eb4c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /redis-2.0.0.tar.gz +/redis-2.2.4.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 1067828..9056139 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -3,8 +3,8 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Summary: A Python client for redis Group: Development/Languages @@ -39,6 +39,9 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Sun Mar 27 2011 Silas Sewell - 2.2.4-1 +- Update to 2.2.4 + * Wed Feb 09 2011 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index aeaa933..488fba9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a77497d026885ed9c467a28e2d00388d redis-2.0.0.tar.gz +3fc28c3a37b91dfa7c65730f6cf782e0 redis-2.2.4.tar.gz From a46c41a283fbe0eb58f5c2334321867438325243 Mon Sep 17 00:00:00 2001 From: Silas Sewell Date: Jul 25 2011 00:32:35 +0000 Subject: [PATCH 4/55] Update to 2.4.9 --- diff --git a/.gitignore b/.gitignore index 04eb4c4..d986151 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /redis-2.0.0.tar.gz /redis-2.2.4.tar.gz +/redis-2.4.9.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 9056139..fd91db8 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -3,7 +3,7 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.2.4 +Version: 2.4.9 Release: 1%{?dist} Summary: A Python client for redis @@ -39,6 +39,9 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Sun Jul 24 2011 Silas Sewell - 2.4.9-1 +- Update to 2.4.9 + * Sun Mar 27 2011 Silas Sewell - 2.2.4-1 - Update to 2.2.4 diff --git a/sources b/sources index 488fba9..3b9cf55 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ a77497d026885ed9c467a28e2d00388d redis-2.0.0.tar.gz 3fc28c3a37b91dfa7c65730f6cf782e0 redis-2.2.4.tar.gz +b512ff37d06c6813f04a57f6448a1e55 redis-2.4.9.tar.gz From c354136f5ac64d38c05c09a2dda299fa37fd64cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jan 14 2012 02:03:52 +0000 Subject: [PATCH 5/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index fd91db8..9d4b4cb 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -4,7 +4,7 @@ Name: python-%{upstream_name} Version: 2.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python client for redis Group: Development/Languages @@ -39,6 +39,9 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 2.4.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Jul 24 2011 Silas Sewell - 2.4.9-1 - Update to 2.4.9 From 1cb6d42a2616f85c04af7009740e5f5c2719ef30 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jul 21 2012 08:12:14 +0000 Subject: [PATCH 6/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index 9d4b4cb..1ce634c 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -4,7 +4,7 @@ Name: python-%{upstream_name} Version: 2.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Python client for redis Group: Development/Languages @@ -39,6 +39,9 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 2.4.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 2.4.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 01bcc33f201d89fca5d99c761f5c92aace1a62c8 Mon Sep 17 00:00:00 2001 From: Silas Sewell Date: Dec 27 2012 16:52:19 +0000 Subject: [PATCH 7/55] Update to 2.7.2 --- diff --git a/.gitignore b/.gitignore index d986151..e6f0d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /redis-2.0.0.tar.gz /redis-2.2.4.tar.gz /redis-2.4.9.tar.gz +/redis-2.7.2.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 1ce634c..efeb187 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -3,14 +3,14 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.4.9 -Release: 3%{?dist} +Version: 2.7.2 +Release: 1%{?dist} Summary: A Python client for redis Group: Development/Languages License: MIT URL: http://github.com/andymccurdy/redis-py -Source0: http://github.com/downloads/andymccurdy/redis-py/%{upstream_name}-%{version}.tar.gz +Source0: http://pypi.python.org/packages/source/r/redis/redis-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -39,6 +39,9 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Thu Dec 27 2012 Silas Sewell - 2.7.2-1 +- Update to 2.7.2 + * Sat Jul 21 2012 Fedora Release Engineering - 2.4.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 3b9cf55..be0bcf1 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ a77497d026885ed9c467a28e2d00388d redis-2.0.0.tar.gz 3fc28c3a37b91dfa7c65730f6cf782e0 redis-2.2.4.tar.gz b512ff37d06c6813f04a57f6448a1e55 redis-2.4.9.tar.gz +17ac60dcf13eb33f82cc25974ab17157 redis-2.7.2.tar.gz From e3b2aeb144bff14e89c903ca203b611645e72e88 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 14 2013 20:15:07 +0000 Subject: [PATCH 8/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index efeb187..7c6553f 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -4,7 +4,7 @@ Name: python-%{upstream_name} Version: 2.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python client for redis Group: Development/Languages @@ -39,6 +39,9 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 2.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Dec 27 2012 Silas Sewell - 2.7.2-1 - Update to 2.7.2 From 8b4dc5d3599b5b50d56efd8102fd8ac4993f5af3 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Jul 27 2013 19:35:13 +0000 Subject: [PATCH 9/55] Update to 2.7.6 --- diff --git a/.gitignore b/.gitignore index e6f0d6c..b5630ef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /redis-2.2.4.tar.gz /redis-2.4.9.tar.gz /redis-2.7.2.tar.gz +/redis-2.7.6.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 7c6553f..376f698 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -3,8 +3,8 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.7.2 -Release: 2%{?dist} +Version: 2.7.6 +Release: 1%{?dist} Summary: A Python client for redis Group: Development/Languages @@ -39,6 +39,9 @@ rm -rf %{buildroot} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info %changelog +* Sat Jul 27 2013 Luke Macken - 2.7.6-1 +- Update to 2.7.6 + * Thu Feb 14 2013 Fedora Release Engineering - 2.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index be0bcf1..ab7b9de 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -a77497d026885ed9c467a28e2d00388d redis-2.0.0.tar.gz -3fc28c3a37b91dfa7c65730f6cf782e0 redis-2.2.4.tar.gz -b512ff37d06c6813f04a57f6448a1e55 redis-2.4.9.tar.gz -17ac60dcf13eb33f82cc25974ab17157 redis-2.7.2.tar.gz +e975ea446c40046ef6dc41c98e41a4f8 redis-2.7.6.tar.gz From cc38e707901d1bbbfe3b9931201c225d1c0cf495 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Jul 27 2013 19:36:42 +0000 Subject: [PATCH 10/55] Run the test suite in %check --- diff --git a/python-redis.spec b/python-redis.spec index 376f698..32e6420 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel +BuildRequires: python-py %description This is a Python interface to the Redis key-value store. @@ -32,6 +33,9 @@ rm -rf %{buildroot} %clean rm -rf %{buildroot} +%check +%{__python} setup.py test + %files %defattr(-,root,root,-) %doc CHANGES LICENSE README.md @@ -41,6 +45,7 @@ rm -rf %{buildroot} %changelog * Sat Jul 27 2013 Luke Macken - 2.7.6-1 - Update to 2.7.6 +- Run the test suite * Thu Feb 14 2013 Fedora Release Engineering - 2.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 93944191769ce49e3fbe83d11a36a3ded0bf97b9 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Jul 27 2013 19:39:35 +0000 Subject: [PATCH 11/55] Enable Python3 support --- diff --git a/python-redis.spec b/python-redis.spec index 32e6420..c24e38c 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,5 +1,6 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%global with_python3 1 %global upstream_name redis Name: python-%{upstream_name} @@ -17,35 +18,83 @@ BuildArch: noarch BuildRequires: python-devel BuildRequires: python-py +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-py +%endif + %description This is a Python interface to the Redis key-value store. +%if 0%{?with_python3} +%package -n python3-redis +Summary: A Python3 client for redis +Group: Development/Languages + +%description -n python3-redis +This is a Python interface to the Redis key-value store. +%endif + %prep %setup -q -n %{upstream_name}-%{version} +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif + %build +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif + %{__python} setup.py build %install rm -rf %{buildroot} + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install --skip-build --root=%{buildroot} +popd +%endif + %{__python} setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} %check +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py test +popd +%endif + %{__python} setup.py test %files %defattr(-,root,root,-) -%doc CHANGES LICENSE README.md +%doc CHANGES LICENSE README.rst %{python_sitelib}/%{upstream_name} %{python_sitelib}/%{upstream_name}-%{version}-*.egg-info +%if 0%{?with_python3} +%files -n python3-redis +%defattr(-,root,root,-) +%doc CHANGES LICENSE README.rst +%{python3_sitelib}/%{upstream_name} +%{python3_sitelib}/%{upstream_name}-%{version}-*.egg-info +%endif + %changelog * Sat Jul 27 2013 Luke Macken - 2.7.6-1 - Update to 2.7.6 - Run the test suite +- Add a python3 subpackage * Thu Feb 14 2013 Fedora Release Engineering - 2.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 24eb3572d05dad14ab942130448e96c92bdaa185 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Jul 27 2013 19:44:04 +0000 Subject: [PATCH 12/55] BuildRoot is obsolete --- diff --git a/python-redis.spec b/python-redis.spec index c24e38c..6f00bda 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -12,7 +12,6 @@ Group: Development/Languages License: MIT URL: http://github.com/andymccurdy/redis-py Source0: http://pypi.python.org/packages/source/r/redis/redis-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -54,8 +53,6 @@ popd %{__python} setup.py build %install -rm -rf %{buildroot} - %if 0%{?with_python3} pushd %{py3dir} %{__python3} setup.py install --skip-build --root=%{buildroot} @@ -64,9 +61,6 @@ popd %{__python} setup.py install -O1 --skip-build --root %{buildroot} -%clean -rm -rf %{buildroot} - %check %if 0%{?with_python3} pushd %{py3dir} @@ -95,6 +89,7 @@ popd - Update to 2.7.6 - Run the test suite - Add a python3 subpackage +- Remove obsolete buildroot tag and cleanup * Thu Feb 14 2013 Fedora Release Engineering - 2.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 9073cb1c0841375eeae7498340a7fc8353008396 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Jul 27 2013 20:02:06 +0000 Subject: [PATCH 13/55] Pull in pytest for the unit tests --- diff --git a/python-redis.spec b/python-redis.spec index 6f00bda..8801738 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -16,11 +16,13 @@ Source0: http://pypi.python.org/packages/source/r/redis/redis-%{version}. BuildArch: noarch BuildRequires: python-devel BuildRequires: python-py +BuildRequires: pytest %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-py +BuildRequires: python3-pytest %endif %description From dcabdad3b4e4540485d679d63d839c129f6d669b Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Jul 27 2013 20:10:38 +0000 Subject: [PATCH 14/55] Run redis during the test suite --- diff --git a/python-redis.spec b/python-redis.spec index 8801738..d852b7b 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -17,6 +17,7 @@ BuildArch: noarch BuildRequires: python-devel BuildRequires: python-py BuildRequires: pytest +BuildRequires: redis %if 0%{?with_python3} BuildRequires: python3-devel @@ -64,6 +65,7 @@ popd %{__python} setup.py install -O1 --skip-build --root %{buildroot} %check +redis-server & %if 0%{?with_python3} pushd %{py3dir} %{__python3} setup.py test @@ -71,6 +73,7 @@ popd %endif %{__python} setup.py test +kill %1 %files %defattr(-,root,root,-) From 2647cc39c922cee24609cfda793094d52d274107 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Feb 14 2014 06:07:20 +0000 Subject: [PATCH 15/55] Update to 2.9.1 --- diff --git a/.gitignore b/.gitignore index b5630ef..74baf47 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /redis-2.4.9.tar.gz /redis-2.7.2.tar.gz /redis-2.7.6.tar.gz +/redis-2.9.1.tar.gz diff --git a/python-redis.spec b/python-redis.spec index d852b7b..4b02563 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,45 +1,38 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - %global with_python3 1 %global upstream_name redis Name: python-%{upstream_name} -Version: 2.7.6 +Version: 2.9.1 Release: 1%{?dist} -Summary: A Python client for redis - -Group: Development/Languages +Summary: Python 2 client for redis License: MIT URL: http://github.com/andymccurdy/redis-py Source0: http://pypi.python.org/packages/source/r/redis/redis-%{version}.tar.gz - BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python2-devel +BuildRequires: python-setuptools BuildRequires: python-py BuildRequires: pytest BuildRequires: redis +%description +This is a Python 2 interface to the Redis key-value store. + %if 0%{?with_python3} +%package -n python3-redis +Summary: Python 3 client for redis BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-py BuildRequires: python3-pytest -%endif - -%description -This is a Python interface to the Redis key-value store. - -%if 0%{?with_python3} -%package -n python3-redis -Summary: A Python3 client for redis -Group: Development/Languages %description -n python3-redis -This is a Python interface to the Redis key-value store. +This is a Python 3 interface to the Redis key-value store. %endif %prep -%setup -q -n %{upstream_name}-%{version} +%setup -qn %{upstream_name}-%{version} +rm -rf %{upstream_name}.egg-info %if 0%{?with_python3} rm -rf %{py3dir} @@ -53,16 +46,16 @@ pushd %{py3dir} popd %endif -%{__python} setup.py build +%{__python2} setup.py build %install %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root=%{buildroot} +%{__python3} setup.py install -O1 --skip-build --root=%{buildroot} popd %endif -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} %check redis-server & @@ -72,24 +65,27 @@ pushd %{py3dir} popd %endif -%{__python} setup.py test +%{__python2} setup.py test kill %1 %files -%defattr(-,root,root,-) -%doc CHANGES LICENSE README.rst -%{python_sitelib}/%{upstream_name} -%{python_sitelib}/%{upstream_name}-%{version}-*.egg-info +%doc CHANGES LICENSE PKG-INFO README.rst +%{python2_sitelib}/%{upstream_name} +%{python2_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %if 0%{?with_python3} %files -n python3-redis -%defattr(-,root,root,-) -%doc CHANGES LICENSE README.rst +%doc CHANGES LICENSE PKG-INFO README.rst %{python3_sitelib}/%{upstream_name} -%{python3_sitelib}/%{upstream_name}-%{version}-*.egg-info +%{python3_sitelib}/%{upstream_name}-%{version}-py%{python2_version}.egg-info %endif %changelog +* Fri Feb 14 2014 Christopher Meng - 2.9.1-1 +- Update to 2.9.1 +- Use generated egg instead of bundled egg +- Cleanup again + * Sat Jul 27 2013 Luke Macken - 2.7.6-1 - Update to 2.7.6 - Run the test suite diff --git a/sources b/sources index ab7b9de..4aaba6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e975ea446c40046ef6dc41c98e41a4f8 redis-2.7.6.tar.gz +1da8ff78be75d7acf5d4684e77fc3606 redis-2.9.1.tar.gz From e1a8f718c39d1b2db66ac76b2c7f2090d8b43a42 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Feb 14 2014 06:19:15 +0000 Subject: [PATCH 16/55] Fix obfuscated lines. --- diff --git a/python-redis.spec b/python-redis.spec index 4b02563..84691cd 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -69,15 +69,15 @@ popd kill %1 %files -%doc CHANGES LICENSE PKG-INFO README.rst +%doc CHANGES LICENSE README.rst %{python2_sitelib}/%{upstream_name} -%{python2_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info +%{python2_sitelib}/%{upstream_name}-%{version}-py%{python2_version}.egg-info %if 0%{?with_python3} %files -n python3-redis -%doc CHANGES LICENSE PKG-INFO README.rst +%doc CHANGES LICENSE README.rst %{python3_sitelib}/%{upstream_name} -%{python3_sitelib}/%{upstream_name}-%{version}-py%{python2_version}.egg-info +%{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %endif %changelog From 4416e24b05bf886edbe7381692b87e851a2cf6c6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: May 27 2014 22:37:06 +0000 Subject: [PATCH 17/55] Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 --- diff --git a/python-redis.spec b/python-redis.spec index 84691cd..bd08d70 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -3,7 +3,7 @@ Name: python-%{upstream_name} Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python 2 client for redis License: MIT URL: http://github.com/andymccurdy/redis-py @@ -81,6 +81,9 @@ kill %1 %endif %changelog +* Wed May 28 2014 Kalev Lember - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + * Fri Feb 14 2014 Christopher Meng - 2.9.1-1 - Update to 2.9.1 - Use generated egg instead of bundled egg From f20095caf0b44cfe213ce79b0380e8a45a7c5555 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jun 07 2014 22:40:17 +0000 Subject: [PATCH 18/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index bd08d70..39557df 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -3,7 +3,7 @@ Name: python-%{upstream_name} Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python 2 client for redis License: MIT URL: http://github.com/andymccurdy/redis-py @@ -81,6 +81,9 @@ kill %1 %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed May 28 2014 Kalev Lember - 2.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 From 3713f6ad154133c539901a2938f00f3905da1e67 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Jun 19 2014 10:32:35 +0000 Subject: [PATCH 19/55] Update to 2.10.1 --- diff --git a/.gitignore b/.gitignore index 74baf47..0e3d611 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /redis-2.7.2.tar.gz /redis-2.7.6.tar.gz /redis-2.9.1.tar.gz +/redis-2.10.1.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 39557df..ecd1140 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,10 +1,13 @@ +%if 0%{?fedora} >= 13 || 0%{?el} >= 8 %global with_python3 1 +%endif + %global upstream_name redis Name: python-%{upstream_name} -Version: 2.9.1 -Release: 3%{?dist} -Summary: Python 2 client for redis +Version: 2.10.1 +Release: 1%{?dist} +Summary: Python 2.x interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py Source0: http://pypi.python.org/packages/source/r/redis/redis-%{version}.tar.gz @@ -20,7 +23,7 @@ This is a Python 2 interface to the Redis key-value store. %if 0%{?with_python3} %package -n python3-redis -Summary: Python 3 client for redis +Summary: Python 3.x interface to the Redis key-value store BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-py @@ -45,7 +48,6 @@ pushd %{py3dir} %{__python3} setup.py build popd %endif - %{__python2} setup.py build %install @@ -64,7 +66,6 @@ pushd %{py3dir} %{__python3} setup.py test popd %endif - %{__python2} setup.py test kill %1 @@ -81,6 +82,9 @@ kill %1 %endif %changelog +* Thu Jun 19 2014 Christopher Meng - 2.10.1-1 +- Update to 2.10.1 + * Sat Jun 07 2014 Fedora Release Engineering - 2.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 4aaba6e..e11b662 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1da8ff78be75d7acf5d4684e77fc3606 redis-2.9.1.tar.gz +6ffdea9c476b4815ddfee9a7362819ea redis-2.10.1.tar.gz From 4f6dffa331420b4627ed4de1ff4295701c39685e Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Aug 12 2014 04:42:54 +0000 Subject: [PATCH 20/55] Update to 2.10.2 --- diff --git a/.gitignore b/.gitignore index 0e3d611..4c3d4ed 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /redis-2.7.6.tar.gz /redis-2.9.1.tar.gz /redis-2.10.1.tar.gz +/redis-2.10.2.tar.gz diff --git a/python-redis.spec b/python-redis.spec index ecd1140..013aac4 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -5,9 +5,9 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.10.1 +Version: 2.10.2 Release: 1%{?dist} -Summary: Python 2.x interface to the Redis key-value store +Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py Source0: http://pypi.python.org/packages/source/r/redis/redis-%{version}.tar.gz @@ -23,7 +23,7 @@ This is a Python 2 interface to the Redis key-value store. %if 0%{?with_python3} %package -n python3-redis -Summary: Python 3.x interface to the Redis key-value store +Summary: Python 3 interface to the Redis key-value store BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-py @@ -35,7 +35,7 @@ This is a Python 3 interface to the Redis key-value store. %prep %setup -qn %{upstream_name}-%{version} -rm -rf %{upstream_name}.egg-info +rm -frv %{upstream_name}.egg-info %if 0%{?with_python3} rm -rf %{py3dir} @@ -56,7 +56,6 @@ pushd %{py3dir} %{__python3} setup.py install -O1 --skip-build --root=%{buildroot} popd %endif - %{__python2} setup.py install -O1 --skip-build --root %{buildroot} %check @@ -82,6 +81,9 @@ kill %1 %endif %changelog +* Tue Aug 12 2014 Christopher Meng - 2.10.2-1 +- Update to 2.10.2 + * Thu Jun 19 2014 Christopher Meng - 2.10.1-1 - Update to 2.10.1 diff --git a/sources b/sources index e11b662..13f92fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ffdea9c476b4815ddfee9a7362819ea redis-2.10.1.tar.gz +03c749a5809fed0bab0a41cb8c1d3793 redis-2.10.2.tar.gz From a28341169022120813277b4d129fc61160157911 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Aug 21 2014 08:01:01 +0000 Subject: [PATCH 21/55] Update to 2.10.3 --- diff --git a/.gitignore b/.gitignore index 4c3d4ed..a81d241 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /redis-2.9.1.tar.gz /redis-2.10.1.tar.gz /redis-2.10.2.tar.gz +/redis-2.10.3.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 013aac4..fedcce0 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -5,7 +5,7 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.10.2 +Version: 2.10.3 Release: 1%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT @@ -81,6 +81,9 @@ kill %1 %endif %changelog +* Thu Aug 21 2014 Christopher Meng - 2.10.3-1 +- Update to 2.10.3 + * Tue Aug 12 2014 Christopher Meng - 2.10.2-1 - Update to 2.10.2 diff --git a/sources b/sources index 13f92fb..7760cfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03c749a5809fed0bab0a41cb8c1d3793 redis-2.10.2.tar.gz +7619221ad0cbd124a5687458ea3f5289 redis-2.10.3.tar.gz From 380073a9d05bce3de4e8a3c377a1593641eec04c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jun 18 2015 20:34:57 +0000 Subject: [PATCH 22/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index fedcce0..86b9ce0 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -81,6 +81,9 @@ kill %1 %endif %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 2.10.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Aug 21 2014 Christopher Meng - 2.10.3-1 - Update to 2.10.3 From 5409929ede466ce21c10ca16fe3dfd3a404c49e2 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 10 2015 20:06:14 +0000 Subject: [PATCH 23/55] Remove test that fails erroneously in koji. --- diff --git a/python-redis.spec b/python-redis.spec index 86b9ce0..ef01cd5 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -37,6 +37,9 @@ This is a Python 3 interface to the Redis key-value store. %setup -qn %{upstream_name}-%{version} rm -frv %{upstream_name}.egg-info +# This test passes locally but fails in koji... +rm tests/test_commands.py* + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -81,6 +84,9 @@ kill %1 %endif %changelog +* Fri Jul 10 2015 Ralph Bean - 2.10.3-3 +- Remove test that fails erroneously in koji. + * Thu Jun 18 2015 Fedora Release Engineering - 2.10.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9826aa1b7d3b03ec2830a23c45139f94db5fe578 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Nov 10 2015 17:02:25 +0000 Subject: [PATCH 24/55] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- diff --git a/python-redis.spec b/python-redis.spec index ef01cd5..b21f7a5 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -84,6 +84,9 @@ kill %1 %endif %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 2.10.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Fri Jul 10 2015 Ralph Bean - 2.10.3-3 - Remove test that fails erroneously in koji. From 46f0c1239613711b235d04a3048d6c12bb261e78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Feb 04 2016 20:45:18 +0000 Subject: [PATCH 25/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index b21f7a5..09f898e 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -84,6 +84,9 @@ kill %1 %endif %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.10.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Nov 10 2015 Fedora Release Engineering - 2.10.3-4 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From adca6aeedb06dc55388e782feabfc8f9d16f232e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Apr 04 2016 17:16:14 +0000 Subject: [PATCH 26/55] 2.10.5 --- diff --git a/.gitignore b/.gitignore index a81d241..a70bbce 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /redis-2.10.1.tar.gz /redis-2.10.2.tar.gz /redis-2.10.3.tar.gz +/redis-2.10.5.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 09f898e..075650c 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -5,8 +5,8 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.10.3 -Release: 5%{?dist} +Version: 2.10.5 +Release: 1%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -84,6 +84,9 @@ kill %1 %endif %changelog +* Mon Apr 04 2016 Ralph Bean - 2.10.5-1 +- new version + * Thu Feb 04 2016 Fedora Release Engineering - 2.10.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 7760cfc..7dd50d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7619221ad0cbd124a5687458ea3f5289 redis-2.10.3.tar.gz +3b26c2b9703b4b56b30a1ad508e31083 redis-2.10.5.tar.gz From 89753904f69a131eb13cc48be1f3abb4ac7fb66a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 19 2016 11:23:33 +0000 Subject: [PATCH 27/55] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- diff --git a/python-redis.spec b/python-redis.spec index 075650c..e136508 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -84,6 +84,9 @@ kill %1 %endif %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2.10.5-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Mon Apr 04 2016 Ralph Bean - 2.10.5-1 - new version From 9f96b5bf2f2be0185c8059c95fa83a1589b90f49 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Dec 19 2016 17:20:38 +0000 Subject: [PATCH 28/55] Rebuild for Python 3.6 --- diff --git a/python-redis.spec b/python-redis.spec index e136508..fdb2652 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -84,6 +84,9 @@ kill %1 %endif %changelog +* Mon Dec 19 2016 Miro Hrončok - 2.10.5-3 +- Rebuild for Python 3.6 + * Tue Jul 19 2016 Fedora Release Engineering - 2.10.5-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From d3f19fbad3005a8d9144a848ff1e12987427adc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Feb 11 2017 10:16:39 +0000 Subject: [PATCH 29/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index fdb2652..5f8c66d 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -84,6 +84,9 @@ kill %1 %endif %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.10.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 2.10.5-3 - Rebuild for Python 3.6 From 80cbe27e935fbead335c54f7e870a754837f927d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 27 2017 11:37:44 +0000 Subject: [PATCH 30/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- diff --git a/python-redis.spec b/python-redis.spec index 5f8c66d..02c1b5a 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -84,6 +84,9 @@ kill %1 %endif %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.10.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.10.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From fb2444ab5b91a9d04049d205d36d84118b97b02b Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Aug 19 2017 13:42:28 +0000 Subject: [PATCH 31/55] Python 2 binary package renamed to python2-redis --- diff --git a/python-redis.spec b/python-redis.spec index 02c1b5a..458d4ef 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: http://github.com/andymccurdy/redis-py @@ -18,9 +18,17 @@ BuildRequires: python-py BuildRequires: pytest BuildRequires: redis -%description +%global _description\ This is a Python 2 interface to the Redis key-value store. +%description %_description + +%package -n python2-redis +Summary: %summary +%{?python_provide:%python_provide python2-redis} + +%description -n python2-redis %_description + %if 0%{?with_python3} %package -n python3-redis Summary: Python 3 interface to the Redis key-value store @@ -71,7 +79,7 @@ popd %{__python2} setup.py test kill %1 -%files +%files -n python2-redis %doc CHANGES LICENSE README.rst %{python2_sitelib}/%{upstream_name} %{python2_sitelib}/%{upstream_name}-%{version}-py%{python2_version}.egg-info @@ -84,6 +92,10 @@ kill %1 %endif %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.10.5-6 +- Python 2 binary package renamed to python2-redis + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Jul 27 2017 Fedora Release Engineering - 2.10.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 05db9a8bd59ffe1442997c37b59dfd3310bfd217 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Dec 17 2017 23:09:04 +0000 Subject: [PATCH 32/55] Update to 2.10.6. Fixes bug #1482297 --- diff --git a/.gitignore b/.gitignore index a70bbce..29d8787 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /redis-2.10.2.tar.gz /redis-2.10.3.tar.gz /redis-2.10.5.tar.gz +/2.10.6.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 458d4ef..ee9a09f 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -5,18 +5,19 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.10.5 -Release: 6%{?dist} +Version: 2.10.6 +Release: 1%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT -URL: http://github.com/andymccurdy/redis-py -Source0: http://pypi.python.org/packages/source/r/redis/redis-%{version}.tar.gz +URL: https://github.com/andymccurdy/redis-py +Source0: https://github.com/andymccurdy/redis-py/archive/%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-py BuildRequires: pytest BuildRequires: redis +BuildRequires: python2-mock %global _description\ This is a Python 2 interface to the Redis key-value store. @@ -36,13 +37,14 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-py BuildRequires: python3-pytest +BuildRequires: python3-mock %description -n python3-redis This is a Python 3 interface to the Redis key-value store. %endif %prep -%setup -qn %{upstream_name}-%{version} +%setup -qn redis-py-%{version} rm -frv %{upstream_name}.egg-info # This test passes locally but fails in koji... @@ -92,6 +94,9 @@ kill %1 %endif %changelog +* Sun Dec 17 2017 Kevin Fenzi - 2.10.6-1 +- Update to 2.10.6. Fixes bug #1482297 + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.10.5-6 - Python 2 binary package renamed to python2-redis See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 diff --git a/sources b/sources index 7dd50d7..238486b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b26c2b9703b4b56b30a1ad508e31083 redis-2.10.5.tar.gz +SHA512 (2.10.6.tar.gz) = b3a674ec248add9d6fd537c2d98bda48fc1867d111015dee772812e04e92dab879a2f913fb5d366ea3bb8469da6f1c91bdb3d73e797405d14a52109ff125a122 From 30223f02e16cef057b4f62bd12b53f1298bf773c Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Jan 27 2018 02:23:35 +0000 Subject: [PATCH 33/55] Update Python 2 dependency declarations to new packaging standards --- diff --git a/python-redis.spec b/python-redis.spec index ee9a09f..f2f1a84 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,16 +6,16 @@ Name: python-%{upstream_name} Version: 2.10.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py Source0: https://github.com/andymccurdy/redis-py/archive/%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python-py -BuildRequires: pytest +BuildRequires: python2-setuptools +BuildRequires: python2-py +BuildRequires: python2-pytest BuildRequires: redis BuildRequires: python2-mock @@ -94,6 +94,10 @@ kill %1 %endif %changelog +* Sat Jan 27 2018 Iryna Shcherbina - 2.10.6-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Sun Dec 17 2017 Kevin Fenzi - 2.10.6-1 - Update to 2.10.6. Fixes bug #1482297 From 4d69999792ee98da451cec2cfe5d076d6f8eeb1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Feb 09 2018 10:27:20 +0000 Subject: [PATCH 34/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index f2f1a84..210841b 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -94,6 +94,9 @@ kill %1 %endif %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.10.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 27 2018 Iryna Shcherbina - 2.10.6-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 5cee93ac5be0bf9002f1c5c32b1a96abecf341fd Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 16 2018 01:31:45 +0000 Subject: [PATCH 35/55] Rebuilt for Python 3.7 --- diff --git a/python-redis.spec b/python-redis.spec index 210841b..1b2a4d5 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -94,6 +94,9 @@ kill %1 %endif %changelog +* Sat Jun 16 2018 Miro Hrončok - 2.10.6-4 +- Rebuilt for Python 3.7 + * Fri Feb 09 2018 Fedora Release Engineering - 2.10.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0fe1202472e4beba323c0d7dea8c56b168d311ae Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 16 2018 08:12:42 +0000 Subject: [PATCH 36/55] BR jemalloc to workaround #1591808 --- diff --git a/python-redis.spec b/python-redis.spec index 1b2a4d5..de90419 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -19,6 +19,9 @@ BuildRequires: python2-pytest BuildRequires: redis BuildRequires: python2-mock +# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1591808 +BuildRequires: jemalloc + %global _description\ This is a Python 2 interface to the Redis key-value store. From 5eb67dd734c16f2947c5a2cda978af394b314148 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 14 2018 01:50:41 +0000 Subject: [PATCH 37/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index de90419..a685c52 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -97,6 +97,9 @@ kill %1 %endif %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.10.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Jun 16 2018 Miro Hrončok - 2.10.6-4 - Rebuilt for Python 3.7 From 27b909a9b9c766662ad7b67df4b760ccba8ea1cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Feb 02 2019 08:58:54 +0000 Subject: [PATCH 38/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index a685c52..fd08cf9 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 2.10.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -97,6 +97,9 @@ kill %1 %endif %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.10.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.10.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 69fd12b5d4b0e09b5f6febc73801a182fc18a660 Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Feb 11 2019 10:32:50 +0000 Subject: [PATCH 39/55] Update to 3.1.0. Fixes bug #1670235 --- diff --git a/.gitignore b/.gitignore index 29d8787..c5c71f1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /redis-2.10.3.tar.gz /redis-2.10.5.tar.gz /2.10.6.tar.gz +/3.1.0.tar.gz diff --git a/python-redis.spec b/python-redis.spec index fd08cf9..8442483 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -5,8 +5,8 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 2.10.6 -Release: 6%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -97,6 +97,9 @@ kill %1 %endif %changelog +* Mon Feb 11 2019 Javier Peña - 3.1.0-1 +- Update to 3.1.0. Fixes bug #1670235 + * Sat Feb 02 2019 Fedora Release Engineering - 2.10.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 238486b..83af590 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (2.10.6.tar.gz) = b3a674ec248add9d6fd537c2d98bda48fc1867d111015dee772812e04e92dab879a2f913fb5d366ea3bb8469da6f1c91bdb3d73e797405d14a52109ff125a122 +SHA512 (3.1.0.tar.gz) = 22084d624d481ee88b59ad582ff6088a1d42cf3b1ec6f6e5c5ea8db4f85d33f49ecf690e65e70b74184c58ce66e57bcfb2bd489386644c18bd75615d1cbed607 From 4551264118a56e5573ead46e1adec591c298d3d9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Jun 22 2019 20:31:03 +0000 Subject: [PATCH 40/55] Update to 3.2.1. Fixes bug #1670235 --- diff --git a/.gitignore b/.gitignore index c5c71f1..4a1317a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /redis-2.10.5.tar.gz /2.10.6.tar.gz /3.1.0.tar.gz +/3.2.1.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 8442483..30a0f76 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -5,7 +5,7 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 3.1.0 +Version: 3.2.1 Release: 1%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT @@ -97,6 +97,9 @@ kill %1 %endif %changelog +* Sat Jun 22 2019 Kevin Fenzi - 3.2.1-1 +- Update to 3.2.1. Fixes bug #1670235 + * Mon Feb 11 2019 Javier Peña - 3.1.0-1 - Update to 3.1.0. Fixes bug #1670235 diff --git a/sources b/sources index 83af590..832c191 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (2.10.6.tar.gz) = b3a674ec248add9d6fd537c2d98bda48fc1867d111015dee772812e04e92dab879a2f913fb5d366ea3bb8469da6f1c91bdb3d73e797405d14a52109ff125a122 -SHA512 (3.1.0.tar.gz) = 22084d624d481ee88b59ad582ff6088a1d42cf3b1ec6f6e5c5ea8db4f85d33f49ecf690e65e70b74184c58ce66e57bcfb2bd489386644c18bd75615d1cbed607 +SHA512 (3.2.1.tar.gz) = aa3de85596d730dc16ca5fb6bd172d6537cb50e310110bbcba2a955f10907838c53b0d097f2c2b9d6444b14d9e548cc15addf67c87abee1ac81bd48c0e0ba0b7 From 97736123574e5e1752b8b82b8b2a742f8595bbf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 26 2019 15:55:38 +0000 Subject: [PATCH 41/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index 30a0f76..eb197b0 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -97,6 +97,9 @@ kill %1 %endif %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Jun 22 2019 Kevin Fenzi - 3.2.1-1 - Update to 3.2.1. Fixes bug #1670235 From 4228fc7ae0296ce1d316b19b89ad3788a5a12473 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Aug 16 2019 13:29:12 +0000 Subject: [PATCH 42/55] Rebuilt for Python 3.8 --- diff --git a/python-redis.spec b/python-redis.spec index eb197b0..f42e482 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -6,7 +6,7 @@ Name: python-%{upstream_name} Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -97,6 +97,9 @@ kill %1 %endif %changelog +* Fri Aug 16 2019 Miro Hrončok - 3.2.1-3 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 95ad84f23a105b15452c1bf3a748f5284fb30ce1 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 08 2019 21:50:05 +0000 Subject: [PATCH 43/55] Subpackage python2-redis has been removed --- diff --git a/python-redis.spec b/python-redis.spec index f42e482..2a850b4 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,23 +1,14 @@ -%if 0%{?fedora} >= 13 || 0%{?el} >= 8 -%global with_python3 1 -%endif - %global upstream_name redis Name: python-%{upstream_name} Version: 3.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python 2 interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py Source0: https://github.com/andymccurdy/redis-py/archive/%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-py -BuildRequires: python2-pytest BuildRequires: redis -BuildRequires: python2-mock # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1591808 BuildRequires: jemalloc @@ -27,15 +18,9 @@ This is a Python 2 interface to the Redis key-value store. %description %_description -%package -n python2-redis -Summary: %summary -%{?python_provide:%python_provide python2-redis} - -%description -n python2-redis %_description - -%if 0%{?with_python3} %package -n python3-redis Summary: Python 3 interface to the Redis key-value store +%{?python_provide:%python_provide python3-redis} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-py @@ -44,7 +29,6 @@ BuildRequires: python3-mock %description -n python3-redis This is a Python 3 interface to the Redis key-value store. -%endif %prep %setup -qn redis-py-%{version} @@ -53,50 +37,28 @@ rm -frv %{upstream_name}.egg-info # This test passes locally but fails in koji... rm tests/test_commands.py* -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif %build -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py build -popd -%endif -%{__python2} setup.py build %install -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py install -O1 --skip-build --root=%{buildroot} -popd -%endif -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} %check redis-server & -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py test -popd -%endif -%{__python2} setup.py test kill %1 -%files -n python2-redis -%doc CHANGES LICENSE README.rst -%{python2_sitelib}/%{upstream_name} -%{python2_sitelib}/%{upstream_name}-%{version}-py%{python2_version}.egg-info - -%if 0%{?with_python3} %files -n python3-redis %doc CHANGES LICENSE README.rst %{python3_sitelib}/%{upstream_name} %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info -%endif %changelog +* Sun Sep 08 2019 Miro Hrončok - 3.2.1-4 +- Subpackage python2-redis has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Fri Aug 16 2019 Miro Hrončok - 3.2.1-3 - Rebuilt for Python 3.8 From a1f52824bde63de98b7f13de71c599a07a16b1d9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Oct 06 2019 17:34:34 +0000 Subject: [PATCH 44/55] Update to 3.3.8. --- diff --git a/.gitignore b/.gitignore index 4a1317a..d0a19b1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /2.10.6.tar.gz /3.1.0.tar.gz /3.2.1.tar.gz +/3.3.8.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 2a850b4..c88b75c 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,20 +1,17 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 3.2.1 -Release: 4%{?dist} -Summary: Python 2 interface to the Redis key-value store +Version: 3.3.8 +Release: 1%{?dist} +Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py Source0: https://github.com/andymccurdy/redis-py/archive/%{version}.tar.gz BuildArch: noarch BuildRequires: redis -# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1591808 -BuildRequires: jemalloc - %global _description\ -This is a Python 2 interface to the Redis key-value store. +This is a Python interface to the Redis key-value store. %description %_description @@ -39,10 +36,10 @@ rm tests/test_commands.py* %build -%{__python3} setup.py build +%py3_build %install -%{__python3} setup.py install -O1 --skip-build --root=%{buildroot} +%py3_install %check redis-server & @@ -55,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Sun Oct 06 2019 Kevin Fenzi - 3.3.8-1 +- Update to 3.3.8. + * Sun Sep 08 2019 Miro Hrončok - 3.2.1-4 - Subpackage python2-redis has been removed See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal diff --git a/sources b/sources index 832c191..2553e56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.2.1.tar.gz) = aa3de85596d730dc16ca5fb6bd172d6537cb50e310110bbcba2a955f10907838c53b0d097f2c2b9d6444b14d9e548cc15addf67c87abee1ac81bd48c0e0ba0b7 +SHA512 (3.3.8.tar.gz) = 0fafa092c09fc602dc897bede5908d821c12c930227c4015d0e507c6f0279e14cc35977131bf1c6d2896fc7ff64c62d445d1f17f9d6b41212d79db8d2e839c76 From 94600a3562ddb4c3542c1a21d9e5cc2ad43d76b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jan 30 2020 14:54:54 +0000 Subject: [PATCH 45/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index c88b75c..446c1f5 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -2,7 +2,7 @@ Name: python-%{upstream_name} Version: 3.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Oct 06 2019 Kevin Fenzi - 3.3.8-1 - Update to 3.3.8. From fa3ffeff9fd9dff9c144cf362bb6682575ec064a Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mar 16 2020 20:50:03 +0000 Subject: [PATCH 46/55] Update to 3.4.1 version Signed-off-by: Clement Verna --- diff --git a/.gitignore b/.gitignore index d0a19b1..0f0ec5e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /3.1.0.tar.gz /3.2.1.tar.gz /3.3.8.tar.gz +/3.4.1.tar.gz diff --git a/python-redis.spec b/python-redis.spec index 446c1f5..bce4792 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,8 +1,8 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 3.3.8 -Release: 2%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -43,7 +43,7 @@ rm tests/test_commands.py* %check redis-server & -%{__python3} setup.py test +%{__python3} -m pytest kill %1 %files -n python3-redis @@ -52,6 +52,10 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Mar 16 2020 Clément Verna - 3.4.1-1 +- Update to 3.4.1. +- Use pytest to run the unit tests. + * Thu Jan 30 2020 Fedora Release Engineering - 3.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 2553e56..6fd429b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.3.8.tar.gz) = 0fafa092c09fc602dc897bede5908d821c12c930227c4015d0e507c6f0279e14cc35977131bf1c6d2896fc7ff64c62d445d1f17f9d6b41212d79db8d2e839c76 +SHA512 (3.4.1.tar.gz) = fa60759158309d2210cce866cf5a70989d730fd817c8f30e6504ac34b2b5b3626d0cbc49c748510b24d3acb5b72b75522f62d761cfc3069df0063c5018a03677 From 17f70ac6d3fa444662aa60ee5034ebf8115bd271 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: May 23 2020 07:39:22 +0000 Subject: [PATCH 47/55] Rebuilt for Python 3.9 --- diff --git a/python-redis.spec b/python-redis.spec index bce4792..1d8d09b 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -2,7 +2,7 @@ Name: python-%{upstream_name} Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Sat May 23 2020 Miro Hrončok - 3.4.1-2 +- Rebuilt for Python 3.9 + * Mon Mar 16 2020 Clément Verna - 3.4.1-1 - Update to 3.4.1. - Use pytest to run the unit tests. From d4c2ca3edd2656c309ffef8673408fbccb4d20d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 29 2020 03:33:41 +0000 Subject: [PATCH 48/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index 1d8d09b..de3b9e7 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -2,7 +2,7 @@ Name: python-%{upstream_name} Version: 3.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat May 23 2020 Miro Hrončok - 3.4.1-2 - Rebuilt for Python 3.9 From d7ba7ea585a3aa052092dda7081f1a638fb1591a Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Sep 15 2020 09:54:00 +0000 Subject: [PATCH 49/55] Update to 3.5.3 --- diff --git a/.gitignore b/.gitignore index 0f0ec5e..366c5d0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /3.2.1.tar.gz /3.3.8.tar.gz /3.4.1.tar.gz +/3.5.3.tar.gz diff --git a/python-redis.spec b/python-redis.spec index de3b9e7..93e5f9d 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,8 +1,8 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 3.4.1 -Release: 3%{?dist} +Version: 3.5.3 +Release: 1%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Tue Sep 15 2020 Joel Capitao - 3.5.3-1 +- Update to 3.5.3 + * Wed Jul 29 2020 Fedora Release Engineering - 3.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 6fd429b..09caa5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.4.1.tar.gz) = fa60759158309d2210cce866cf5a70989d730fd817c8f30e6504ac34b2b5b3626d0cbc49c748510b24d3acb5b72b75522f62d761cfc3069df0063c5018a03677 +SHA512 (3.5.3.tar.gz) = 3e612172dd6dfd2050c66369b7c39321f751e20539582ffff1857bd4e86a2e552d8356083a4e534bcbd00cc7ac9e1d047ebe3950d99b9b0a8812bf3eeb4b01a4 From 7776e7ce7487f5b8791792452e7cb6ea8a9534fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jan 27 2021 13:04:31 +0000 Subject: [PATCH 50/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index 93e5f9d..571efe7 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -2,7 +2,7 @@ Name: python-%{upstream_name} Version: 3.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 15 2020 Joel Capitao - 3.5.3-1 - Update to 3.5.3 From 4b92198690bfde1620e7e20d7bc09763016b0507 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Jun 03 2021 11:55:37 +0000 Subject: [PATCH 51/55] Rebuilt for Python 3.10 --- diff --git a/python-redis.spec b/python-redis.spec index 571efe7..c915fd2 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -2,7 +2,7 @@ Name: python-%{upstream_name} Version: 3.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Thu Jun 03 2021 Python Maint - 3.5.3-3 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 3.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9d5ae229f34176e1b665ceace813fce6b0fc48d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 23 2021 09:08:26 +0000 Subject: [PATCH 52/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index c915fd2..884f6ee 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -2,7 +2,7 @@ Name: python-%{upstream_name} Version: 3.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 03 2021 Python Maint - 3.5.3-3 - Rebuilt for Python 3.10 From ff3468067b8a50739defe4525444f10b28bb413b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jan 21 2022 15:08:46 +0000 Subject: [PATCH 53/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/python-redis.spec b/python-redis.spec index 884f6ee..d5c7f99 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -2,7 +2,7 @@ Name: python-%{upstream_name} Version: 3.5.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/andymccurdy/redis-py @@ -52,6 +52,9 @@ kill %1 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.5.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.5.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7421136c55bd342efb4ab05ed917969db9e35454 Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: Apr 04 2022 14:15:59 +0000 Subject: [PATCH 54/55] Update to 4.2.2 --- diff --git a/.gitignore b/.gitignore index 366c5d0..b227565 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ /3.3.8.tar.gz /3.4.1.tar.gz /3.5.3.tar.gz +/redis-py-4.1.4.tar.gz +/redis-py-4.2.1.tar.gz +/redis-py-4.2.2.tar.gz diff --git a/python-redis.spec b/python-redis.spec index d5c7f99..15099da 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,12 +1,12 @@ %global upstream_name redis Name: python-%{upstream_name} -Version: 3.5.3 -Release: 5%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: Python interface to the Redis key-value store License: MIT -URL: https://github.com/andymccurdy/redis-py -Source0: https://github.com/andymccurdy/redis-py/archive/%{version}.tar.gz +URL: https://github.com/redis/redis-py +Source0: https://github.com/redis/redis-py/archive/v%{version}/redis-py-%{version}.tar.gz BuildArch: noarch BuildRequires: redis @@ -19,10 +19,13 @@ This is a Python interface to the Redis key-value store. Summary: Python 3 interface to the Redis key-value store %{?python_provide:%python_provide python3-redis} BuildRequires: python3-devel +BuildRequires: python3-deprecated BuildRequires: python3-setuptools BuildRequires: python3-py BuildRequires: python3-pytest BuildRequires: python3-mock +BuildRequires: python3-pytest-asyncio +BuildRequires: python3-async-timeout %description -n python3-redis This is a Python 3 interface to the Redis key-value store. @@ -43,15 +46,18 @@ rm tests/test_commands.py* %check redis-server & -%{__python3} -m pytest +%pytest -m 'not onlycluster and not redismod and not ssl' kill %1 %files -n python3-redis -%doc CHANGES LICENSE README.rst +%doc CHANGES LICENSE README.md %{python3_sitelib}/%{upstream_name} %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Apr 04 2022 Frantisek Zatloukal - 4.2.2-1 +- Update to 4.2.2 + * Fri Jan 21 2022 Fedora Release Engineering - 3.5.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 09caa5a..ff0a0b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.5.3.tar.gz) = 3e612172dd6dfd2050c66369b7c39321f751e20539582ffff1857bd4e86a2e552d8356083a4e534bcbd00cc7ac9e1d047ebe3950d99b9b0a8812bf3eeb4b01a4 +SHA512 (redis-py-4.2.2.tar.gz) = 3d2690b104d36f99db5abc49e80c12f3660aada57ce6a18960bfc5c3aae28e7d05699ea01153c1149568d08370c6a057001ec4838e8010e0a3755fb11642c16b From 04608c6e7682ed881a6889239dec62d6ff3425e1 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Apr 26 2022 19:16:38 +0000 Subject: [PATCH 55/55] Switch to pyproject-rpm-macros This makes EPEL 9 backporting easier as it removes some of the unnecessary dependencies (such as `mock`). Related to BZ 2063713. Signed-off-by: Major Hayden --- diff --git a/python-redis.spec b/python-redis.spec index 15099da..099ee8c 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -1,60 +1,67 @@ +# Enable tests by default. +%bcond_without tests + %global upstream_name redis Name: python-%{upstream_name} Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python interface to the Redis key-value store License: MIT URL: https://github.com/redis/redis-py Source0: https://github.com/redis/redis-py/archive/v%{version}/redis-py-%{version}.tar.gz BuildArch: noarch + +BuildRequires: python3-devel + +%if %{with tests} BuildRequires: redis +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(pytest-asyncio) +%endif %global _description\ This is a Python interface to the Redis key-value store. %description %_description -%package -n python3-redis +%package -n python3-%{upstream_name} Summary: Python 3 interface to the Redis key-value store -%{?python_provide:%python_provide python3-redis} -BuildRequires: python3-devel -BuildRequires: python3-deprecated -BuildRequires: python3-setuptools -BuildRequires: python3-py -BuildRequires: python3-pytest -BuildRequires: python3-mock -BuildRequires: python3-pytest-asyncio -BuildRequires: python3-async-timeout - -%description -n python3-redis +%{?python_provide:%python_provide python3-%{upstream_name}} + +%description -n python3-%{upstream_name} This is a Python 3 interface to the Redis key-value store. %prep %setup -qn redis-py-%{version} -rm -frv %{upstream_name}.egg-info # This test passes locally but fails in koji... rm tests/test_commands.py* +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files %{upstream_name} +%if %{with tests} %check redis-server & %pytest -m 'not onlycluster and not redismod and not ssl' kill %1 +%endif -%files -n python3-redis -%doc CHANGES LICENSE README.md -%{python3_sitelib}/%{upstream_name} -%{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info +%files -n python3-%{upstream_name} -f %{pyproject_files} +%doc CHANGES README.md %changelog +* Tue Apr 26 2022 Major Hayden - 4.2.2-2 +- Switch to pyproject-rpm-macros for easier EPEL 9 backport. + * Mon Apr 04 2022 Frantisek Zatloukal - 4.2.2-1 - Update to 4.2.2