- updated to 4.4.7 (last version for python 2.7)

diff --git a/amqp-objects.inv b/amqp-objects.inv
deleted file mode 100644 (file)
index ef43597..0000000
Binary files a/amqp-objects.inv and /dev/null differ

diff --git a/cyme-objects.inv b/cyme-objects.inv
deleted file mode 100644 (file)
index 1a0b817..0000000
Binary files a/cyme-objects.inv and /dev/null differ

diff --git a/djcelery-objects.inv b/djcelery-objects.inv
deleted file mode 100644 (file)
index 341f3df..0000000
Binary files a/djcelery-objects.inv and /dev/null differ

diff --git a/kombu-objects.inv b/kombu-objects.inv
deleted file mode 100644 (file)
index ee53c6e..0000000
Binary files a/kombu-objects.inv and /dev/null differ

diff --git a/python-celery.spec b/python-celery.spec
index 728b825e48c395658ffddd7ec46bd1e8c55765e6..3dea5715d89991ae142fa04b23bdff318837770d 100644 (file)
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -5,10 +5,10 @@
 #        package! Real-life deployments will mostly be application-specific.
 
 # Conditional build:
-%bcond_with    doc             # do build doc (too much dependencies to be worth the trouble)
+%bcond_with    doc             # Sphinx documentation (too much dependencies to be worth the trouble)
 %bcond_with    tests           # run tests (broken)
 %bcond_without python2         # CPython 2.x module
-%bcond_with    python3         # CPython 3.x module
+%bcond_with    python3         # CPython 3.x module (built from python3-celery.spec)
 %bcond_with    python3_default # Use Python 3.x for celery executables
 
 %if %{without python3}
@@ -17,58 +17,72 @@
 
 %define        module  celery
 Summary:       Celery - Distributed Task Query
+Summary(pl.UTF-8):     Celery - rozproszona kolejka zadań
 Name:          python-%{module}
-# keep python 2 version 4.x here; python3 in python3-celery.spec
-Version:       4.4.0
-Release:       3
+# keep 4.x here for python2 support
+Version:       4.4.7
+Release:       1
 License:       BSD-like
 Group:         Development/Languages/Python
-# Source0:     https://files.pythonhosted.org/packages/source/c/%{module}/%{module}-%{version}.tar.gz
-Source0:       https://pypi.debian.net/%{module}/%{module}-%{version}.tar.gz
-# Source0-md5: 9c5d17291bf204662ecc972eec26789e
-Source1:       amqp-objects.inv
-Source2:       cyme-objects.inv
-Source3:       djcelery-objects.inv
-Source4:       kombu-objects.inv
-Source5:       python-objects.inv
+#Source0Download: https://pypi.org/simple/celery/
+Source0:       https://files.pythonhosted.org/packages/source/c/celery/%{module}-%{version}.tar.gz
+# Source0-md5: 62906067bd50c4e7e97f0b27f44f6bac
 Patch0:                pytz_dependency.patch
 URL:           http://celeryproject.org/
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.710
-BuildRequires: sed >= 4.0
 %if %{with python2}
+BuildRequires: python-modules >= 1:2.7
 BuildRequires: python-setuptools
 %if %{with tests}
+BuildRequires: python-billiard >= 3.6.3.0
+BuildRequires: python-billiard < 4
+BuildRequires: python-boto3 >= 1.9.178
+BuildRequires: python-case >= 1.3.1
+BuildRequires: python-dateutil >= 2.1
+BuildRequires: python-kombu >= 4.6.10
+BuildRequires: python-kombu < 4.7
 BuildRequires: python-mock >= 1.0.1
-BuildRequires: python-modules >= 1:2.7
-BuildRequires: python-nose
-%endif
-%if %{with doc}
-BuildRequires: python-billiard
-BuildRequires: python-django
-BuildRequires: python-kombu
+BuildRequires: python-moto >= 1.3.7
+BuildRequires: python-pytest >= 4.6
 BuildRequires: python-pytz
-BuildRequires: python-sphinxcontrib-issuetracker
-BuildRequires: sphinx-pdg-2
+BuildRequires: python-vine >= 1.3.0
+BuildRequires: python-vine < 5
 %endif
 %endif
 %if %{with python3}
+BuildRequires: python3-modules >= 1:3.5
 BuildRequires: python3-setuptools
 %if %{with tests}
-BuildRequires: python3-nose
+BuildRequires: python3-Sphinx >= 2
+BuildRequires: python3-billiard >= 3.6.3.0
+BuildRequires: python3-billiard < 4
+BuildRequires: python3-boto3 >= 1.9.178
+BuildRequires: python3-case >= 1.3.1
+BuildRequires: python3-dateutil >= 2.1
+BuildRequires: python3-kombu >= 4.6.10
+BuildRequires: python3-kombu < 4.7
+BuildRequires: python3-mock >= 1.0.1
+BuildRequires: python3-moto >= 1.3.7
+BuildRequires: python3-pytest >= 4.6
+BuildRequires: python3-pytz
+BuildRequires: python3-sphinx_testing
+BuildRequires: python3-vine >= 1.3.0
+BuildRequires: python3-vine < 5
 %endif
+%endif
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.714
+BuildRequires: sed >= 4.0
 %if %{with doc}
 BuildRequires: python3-billiard
 BuildRequires: python3-django
 BuildRequires: python3-kombu
 BuildRequires: python3-pytz
+BuildRequires: python3-sphinx_celery >= 2.0.0
 BuildRequires: python3-sphinxcontrib-issuetracker
-BuildRequires: sphinx-pdg-3
-%endif
+BuildRequires: python3-vine >= 1.3.0
+BuildRequires: python3-vine < 5
+BuildRequires: sphinx-pdg-3 >= 2
 %endif
-Requires:      python-billiard >= 3.5.0.2
-Requires:      python-kombu >= 4.2.0
-Requires:      python-pytz
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -77,22 +91,29 @@ Celery is an asynchronous task queue/job queue based on distributed
 message passing. It is focused on real-time operation, but supports
 scheduling as well.
 
+%description -l pl.UTF-8
+Celery to asynchroniczna kolejka zadań oparta na rozproszonym
+przekazywaniu komunikatów. Skupia się na działaniu w czasie
+rzeczywistym, ale obsługuje też szeregowanie.
+
 %package -n python3-%{module}
 Summary:       Celery - Distributed Task Query
+Summary(pl.UTF-8):     Celery - rozproszona kolejka zadań
 Group:         Development/Languages/Python
-Requires:      python3-billiard >= 3.5.0.2
-Requires:      python3-billiard < 4.0
-Requires:      python3-kombu >= 4.2.0
-Requires:      python3-kombu < 5.0
-Requires:      python3-pytz
 
 %description -n python3-%{module}
 Celery is an asynchronous task queue/job queue based on distributed
 message passing. It is focused on real-time operation, but supports
 scheduling as well.
 
+%description -n python3-%{module} -l pl.UTF-8
+Celery to asynchroniczna kolejka zadań oparta na rozproszonym
+przekazywaniu komunikatów. Skupia się na działaniu w czasie
+rzeczywistym, ale obsługuje też szeregowanie.
+
 %package -n celery
 Summary:       Celery - Distributed Task Query
+Summary(pl.UTF-8):     Celery - rozproszona kolejka zadań
 Group:         Development/Languages/Python
 %if %{with python3_default}
 Requires:      python3-%{module} = %{version}
@@ -105,93 +126,87 @@ Celery is an asynchronous task queue/job queue based on distributed
 message passing. It is focused on real-time operation, but supports
 scheduling as well.
 
+%description -n celery -l pl.UTF-8
+Celery to asynchroniczna kolejka zadań oparta na rozproszonym
+przekazywaniu komunikatów. Skupia się na działaniu w czasie
+rzeczywistym, ale obsługuje też szeregowanie.
+
 %package apidocs
-Summary:       %{module} API documentation
-Summary(pl.UTF-8):     Dokumentacja API %{module}
+Summary:       API documentation for Celery
+Summary(pl.UTF-8):     Dokumentacja API Celery
 Group:         Documentation
+Obsoletes:     python3-celery-apidocs < 4.4.7
 
 %description apidocs
-API documentation for %{module}.
+API documentation for Celery.
 
 %description apidocs -l pl.UTF-8
-Dokumentacja API %{module}.
-
-%package -n python3-%{module}-apidocs
-Summary:       %{module} API documentation
-Summary(pl.UTF-8):     Dokumentacja API %{module}
-Group:         Documentation
-
-%description -n python3-%{module}-apidocs
-API documentation for %{module}.
-
-%description -n python3-%{module}-apidocs -l pl.UTF-8
-Dokumentacja API %{module}.
+Dokumentacja API Celery.
 
 %prep
 %setup -q -n %{module}-%{version}
-
 %patch0 -p1
 
-cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} docs
-
 %build
 %if %{with python2}
-%py_build %{?with_tests:test}
+%py_build
 
-%if %{with doc}
-cd docs
-PYTHONPATH=../build-2/lib %{__make} -j1 html SPHINXBUILD=sphinx-build-2
-rm -rf .build/html/_sources
-mv .build .build2
-cd ..
+%if %{with tests}
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS=case.pytest \
+%{__python} -m pytest t/unit -k 'not test_sphinx' -vv
+# celery.contrib.sphinx expects Sphinx 2+
 %endif
 %endif
+
 %if %{with python3}
-%py3_build %{?with_tests:test}
+%py3_build
 
-%if %{with doc} && 0
-cd docs
-PYTHONPATH=../build-3/lib %{__make} -j1 html SPHINXBUILD=sphinx-build-3
-rm -rf .build/html/_sources
-mv .build .build3
-cd ..
+%if %{with tests}
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS=case.pytest \
+%{__python3} -m pytest t/unit
 %endif
 %endif
 
+%if %{with doc}
+%{__make} -C docs html \
+       SPHINXBUILD=sphinx-build-3
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install_python2() {
-       %py_install
-
-       %py_postclean
-}
-install_python3() {
-       %py3_install
-}
-
-# install the right executables last
-%if %{with python3} && %{without python3_default}
-install_python3
-%endif
 %if %{with python2}
-install_python2
-%endif
-%if %{with python3} && %{with python3_default}
-install_python3
-%endif
+%py_install
+
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{celery,celery-2}
 
-%if %{with python2}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name '*.py' \
        | xargs sed -i '1s|^#!.*python\b|#!%{__python}|'
+
+%py_postclean
 %endif
+
 %if %{with python3}
+%py3_install
+
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{celery,celery-3}
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version}
 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}|'
+
+%if %{with python3_default}
+ln -sf celery-3 $RPM_BUILD_ROOT%{_bindir}/celery
+%endif
+%endif
+
+%if %{without python3_default}
+ln -sf celery-2 $RPM_BUILD_ROOT%{_bindir}/celery
 %endif
 
 %clean
@@ -200,32 +215,29 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CONTRIBUTORS.txt LICENSE README.rst TODO extra
+%doc CONTRIBUTORS.txt Changelog.rst LICENSE README.rst TODO extra/{generic-init.d,supervisord,systemd}
+%attr(755,root,root) %{_bindir}/celery-2
 %{py_sitescriptdir}/%{module}
-%{py_sitescriptdir}/celery-*.egg-info
+%{py_sitescriptdir}/celery-%{version}-py*.egg-info
 %{_examplesdir}/%{name}-%{version}
-
-%if %{with doc}
-%files apidocs
-%defattr(644,root,root,755)
-%doc docs/.build2/html/*
-%endif
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc CONTRIBUTORS.txt LICENSE README.rst TODO extra
+%doc CONTRIBUTORS.txt Changelog.rst LICENSE README.rst TODO extra/{generic-init.d,supervisord,systemd}
+%attr(755,root,root) %{_bindir}/celery-3
 %{py3_sitescriptdir}/%{module}
-%{py3_sitescriptdir}/celery-*.egg-info
+%{py3_sitescriptdir}/celery-%{version}-py*.egg-info
 %{_examplesdir}/python3-%{module}-%{version}
+%endif
 
-%if %{with doc} && 0
-%files -n python3-%{module}-apidocs
+%if %{with doc}
+%files apidocs
 %defattr(644,root,root,755)
-%doc docs/.build3/html/*
-%endif
+%doc docs/.build2/html/*
 %endif
 
 %files -n celery
-%attr(755,root,root) %{_bindir}/*
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/celery

diff --git a/python-objects.inv b/python-objects.inv
deleted file mode 100644 (file)
index 6f851b8..0000000
Binary files a/python-objects.inv and /dev/null differ

diff --git a/pytz_dependency.patch b/pytz_dependency.patch
index daaa24cebbcc3085fa740e630fe609705bb8ca76..9aa93823d21b0bb1567cd7f6afda516f6ef24e06 100644 (file)
--- a/pytz_dependency.patch
+++ b/pytz_dependency.patch
@@ -1,9 +1,8 @@
-diff -urNp -x '*.orig' celery-4.4.0.org/requirements/default.txt celery-4.4.0/requirements/default.txt
---- celery-4.4.0.org/requirements/default.txt  2019-12-07 15:50:53.000000000 +0100
-+++ celery-4.4.0/requirements/default.txt      2021-03-04 20:40:36.563745980 +0100
+--- celery-4.4.7/requirements/default.txt.orig 2023-10-23 22:31:52.033342654 +0200
++++ celery-4.4.7/requirements/default.txt      2023-10-23 22:35:29.995495185 +0200
 @@ -1,4 +1,4 @@
 -pytz>dev
 +pytz
- billiard>=3.6.1,<4.0
- kombu>=4.6.7,<4.7
+ billiard>=3.6.3.0,<4.0
+ kombu>=4.6.10,<4.7
  vine==1.3.0