!17 Update package to version 4.6.0

From: @lingjuer 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

python-redis.spec

@@ -1,68 +1,119 @@
+%global _empty_manifest_terminate_build 0
 Name:           python-redis
-Version:        2.10.6
+Version:        4.6.0
-Release:        6
+Release:        1
-Summary:        The Python interface to the Redis key-value store
+Summary:        Python client for Redis key-value store
 License:        MIT
-URL:            https://github.com/andymccurdy/redis-py
+URL:            https://github.com/redis/redis-py
-Source0:        https://github.com/andymccurdy/redis-py/archive/2.10.6.tar.gz
+Source0:        https://files.pythonhosted.org/packages/73/88/63d802c2b18dd9eaa5b846cbf18917c6b2882f20efda398cc16a7500b02c/redis-4.6.0.tar.gz
-
+Source1:        redis.conf
 BuildArch:      noarch
-BuildRequires:  python2-devel python2-setuptools python2-py python2-pytest redis python2-mock jemalloc
-
 %description
 The Python interface to the Redis key-value store.
 
-%package -n python2-redis
-Summary:        The Python2 interface to the Redis key-value store
-%{?python_provide:%python_provide python2-redis}
-
-%description -n python2-redis
-The Python2 interface to the Redis key-value store.
-
 %package -n python3-redis
-Summary:        The Python3 interface to the Redis key-value store
+Summary:        Python client for Redis key-value store
-BuildRequires:  python3-devel python3-setuptools python3-py python3-pytest python3-mock
+Provides:       python-redis
-
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-async-timeout
+BuildRequires:  python3-py
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-asyncio
+BuildRequires:  python3-mock
+BuildRequires:  redis
+Requires:	python3-async-timeout
+Requires:	python3-importlib-metadata
+Requires:	python3-typing-extensions
 %description -n python3-redis
-The Python3 interface to the Redis key-value store.
+The Python interface to the Redis key-value store.
+
+%package help
+Summary:        Python client for Redis key-value store
+Provides:       python3-redis-doc
+%description help
+The Python interface to the Redis key-value store.
 
 %prep
-%autosetup -n redis-py-2.10.6 -p1
+%autosetup -n redis-%{version}
-rm tests/test_commands.py*
-rm -rf %{py3dir}
-cp -a . %{py3dir}
 
 %build
-cd %{py3dir}
+%py3_build
-%{__python3} setup.py build
+
-cd -
-%{__python2} setup.py build
 
 %install
-cd %{py3dir}
+%py3_install
-%{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
+install -d -m755 %{buildroot}/%{_pkgdocdir}
-cd -
+if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
+if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi
+if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi
+if [ -f README.rst ]; then cp -af README.rst %{buildroot}/%{_pkgdocdir}; fi
+if [ -f README.md ]; then cp -af README.md %{buildroot}/%{_pkgdocdir}; fi
+if [ -f README.txt ]; then cp -af README.txt %{buildroot}/%{_pkgdocdir}; fi
+pushd %{buildroot}
+if [ -d usr/lib ]; then
+    find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/lib64 ]; then
+    find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/bin ]; then
+    find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/sbin ]; then
+    find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+touch doclist.lst
+if [ -d usr/share/man ]; then
+    find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst
+fi
+popd
+mv %{buildroot}/filelist.lst .
+mv %{buildroot}/doclist.lst .
 
 %check
-redis-server &
+mkdir -p  %{_builddir}/redis-var/
-cd %{py3dir}
+cp %{SOURCE1} %{_builddir}/redis-var/
-%{__python3} setup.py test
+sed -i "s#^dir .*#dir %{_builddir}/redis-var#g" %{_builddir}/redis-var/redis.conf
-cd -
+sed -i "s#^logfile .*#logfile %{_builddir}/redis-var/redis.log#g" %{_builddir}/redis-var/redis.conf
-%{__python2} setup.py test
+redis-server %{_builddir}/redis-var/redis.conf &
+CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" \
+PATH="%{buildroot}%{_bindir}:$PATH" \
+PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}" \
+PYTHONDONTWRITEBYTECODE=1 \
+%{?__pytest_addopts:PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} %{__pytest_addopts}"} \
+PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus}} \
+/usr/bin/pytest -m 'onlynoncluster and not ssl and not redismod' \
+--ignore "tests/test_credentials.py" \
+--ignore "tests/test_asyncio/test_credentials.py" \
+--ignore "tests/test_asyncio/test_cwe_404.py" \
+--ignore "tests/test_asyncio/test_cluster.py" \
+--ignore "tests/test_ssl.py"
 kill %1
 
+%files -n python3-redis -f filelist.lst
+%dir %{python3_sitelib}/*
 
-%files -n python2-redis
-%doc CHANGES LICENSE README.rst
-%{python2_sitelib}/redis
-%{python2_sitelib}/redis-2.10.6-py%{python2_version}.egg-info
 
-%files -n python3-redis
+%files help -f doclist.lst
-%doc CHANGES LICENSE README.rst
+%{_docdir}/*
-%{python3_sitelib}/redis
-%{python3_sitelib}/redis-2.10.6-py%{python3_version}.egg-info
 
 %changelog
+* Thu Jul 13 2023 zhangchenglin <zhangchenglin@kylinos.cn> - 4.6.0-1
+- Update package to version 4.6.0
+
+* Thu Apr 6 2023 Dongxing Wang <dxwangk@isoftstone.com> - 4.5.5-1
+- upgrade version to 4.5.5
+
+* Mon Aug 09 2021 OpenStack_SIG <openstack@openeuler.org> - 3.5.3-1
+- Update version to 3.5.3
+
+* Tue Jan 12 2021 wutao <wutao61@huawei.com> - 3.4.1-1
+- upgrade to 3.4.1 adapting to pytest
+
+* Wed Aug 05 2020 zhangjiapeng <zhangjiapeng9@huawei.com> - 2.10.6-7
+- Remove python2
+
 * Mon Jan 6 2020 qinjian <qinjian18@huawei.com> - 2.10.6-6
 - Package init

python-redis.yaml

@@ -1,4 +1,4 @@
 version_control: github
-src_repo:  andymccurdy/redis-py
+src_repo: redis/redis-py
 tag_prefix: ^v
-seperator: .
+separator: .