- updated to 5.2.7

diff --git a/python3-celery.spec b/python3-celery.spec
index 3f9e4da2142e8da4534d1da3090182bc7ba6a5b9..c22dd9f215f6793a191fa4dc3fad4574a7ce6bb5 100644 (file)
--- a/python3-celery.spec
+++ b/python3-celery.spec
@@ -1,54 +1,57 @@
-
 # TODO:
 #      - consider init script / systemd job (uid/gid celery 274 used to be used)
 #        NOTE: this must not be included and enabled by default in the default
 #        package! Real-life deployments will mostly be application-specific.
 
 # Conditional build:
-%bcond_with    doc             # Sphinx documentation (too much dependencies to be worth the trouble)
-%bcond_with    tests           # run tests (broken)
+%bcond_without doc             # Sphinx documentation
+%bcond_without tests           # unit tests
 
 %define        module  celery
 Summary:       Celery - Distributed Task Query
 Summary(pl.UTF-8):     Celery - rozproszona kolejka zadań
 Name:          python3-%{module}
-Version:       5.0.5
+Version:       5.2.7
 Release:       1
 License:       BSD-like
 Group:         Development/Languages/Python
 Source0:       https://files.pythonhosted.org/packages/source/c/celery/%{module}-%{version}.tar.gz
-# Source0-md5: a8193028841349fbc7c88e3b67ce608c
-Patch0:                pytz_dependency.patch
+# Source0-md5: d684a4f20069c3c4c2f79e17fec42c52
 URL:           http://celeryproject.org/
+BuildRequires: python3 >= 1:3.7
+BuildRequires: python3-setuptools >= 1:40.8.0
 %if %{with tests}
-BuildRequires: python3-billiard >= 3.6.3.0
+BuildRequires: python3-billiard >= 3.6.4.0
 BuildRequires: python3-billiard < 4
 BuildRequires: python3-boto3 >= 1.9.178
 BuildRequires: python3-case >= 1.3.1
-BuildRequires: python3-click >= 7.0
-BuildRequires: python3-click < 8
+BuildRequires: python3-click >= 8.0.3
+BuildRequires: python3-click < 9
 BuildRequires: python3-click-didyoumean >= 0.0.3
 BuildRequires: python3-click-plugins >= 1.1.1
-BuildRequires: python3-click-repl >= 0.1.6
-BuildRequires: python3-kombu >= 5.0.0
+BuildRequires: python3-click-repl >= 0.2.0
+%if "%{py3_ver}" == "3.7"
+BuildRequires: python3-importlib_metadata >= 1.4.0
+%endif
+BuildRequires: python3-kombu >= 5.2.3
 BuildRequires: python3-kombu < 6
-BuildRequires: python3-moto >= 1.3.7
-BuildRequires: python3-pytest >= 6.0
+BuildRequires: python3-moto >= 2.2.6
+BuildRequires: python3-pymongo
+BuildRequires: python3-pytest >= 6.2
 BuildRequires: python3-pytest-celery
 BuildRequires: python3-pytest-subtests
 BuildRequires: python3-pytest-timeout >= 1.4.2
-BuildRequires: python3-pytz >= 2016.7
+BuildRequires: python3-pytz >= 2021.3
 BuildRequires: python3-vine >= 5.0.0
 BuildRequires: python3-vine < 6
 %endif
-BuildRequires: python3-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: sed >= 4.0
 %if %{with doc}
-BuildRequires: python3-billiard
-BuildRequires: python3-kombu >= 5.0.0
-BuildRequires: python3-pytz >= 2016.7
+BuildRequires: python3-billiard >= 3.6.4.0
+BuildRequires: python3-kombu >= 5.2.3
+BuildRequires: python3-pytz >= 2021.3
 BuildRequires: python3-sphinx_celery >= 2.0.0
 BuildRequires: python3-sphinx_click >= 2.5.0
 BuildRequires: python3-sphinx_testing >= 0.7.2
@@ -97,10 +100,14 @@ Dokumentacja API Celery.
 %prep
 %setup -q -n %{module}-%{version}
 
-%patch0 -p1
-
 %build
-%py3_build %{?with_tests:test}
+%py3_build
+
+%if %{with tests}
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS=celery.contrib.pytest,pytest_subtests \
+%{__python3} -m pytest t/unit
+%endif
 
 %if %{with doc}
 %{__make} -C docs html \
@@ -115,6 +122,10 @@ cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version}
 find $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version} -name '*.py' \
        | xargs %{__sed} -i '1s|^#!.*python\b|#!%{__python3}|'
 
+install -d $RPM_BUILD_ROOT{%{bash_compdir},%{zsh_compdir}}
+cp -p extra/bash-completion/celery.bash $RPM_BUILD_ROOT%{bash_compdir}/celery
+cp -p extra/zsh-completion/celery.zsh $RPM_BUILD_ROOT%{zsh_compdir}/_celery
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,8 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n celery
 %defattr(644,root,root,755)
-# TODO: extra/{bash-completion,zsh-completion}
 %attr(755,root,root) %{_bindir}/celery
+%{bash_compdir}/celery
+%{zsh_compdir}/_celery
 
 %if %{with doc}
 %files apidocs

diff --git a/pytz_dependency.patch b/pytz_dependency.patch
deleted file mode 100644 (file)
index e37584d..0000000
--- a/pytz_dependency.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- celery-5.0.5/requirements/default.txt~     2020-12-16 16:16:37.000000000 +0100
-+++ celery-5.0.5/requirements/default.txt      2021-03-04 23:15:17.093664795 +0100
-@@ -1,4 +1,4 @@
--pytz>dev
-+pytz
- billiard>=3.6.3.0,<4.0
- kombu>=5.0.0,<6.0
- vine>=5.0.0,<6.0