diff --git a/flower-0.8.3.tar.gz b/flower-0.8.3.tar.gz deleted file mode 100644 index 6531200..0000000 --- a/flower-0.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca6ae26361e58491d51eaded0ee7134087f4ea3cdd00ac158d903dc02dd0e85b -size 2217575 diff --git a/flower-0.8.4.tar.gz b/flower-0.8.4.tar.gz new file mode 100644 index 0000000..d76e9cb --- /dev/null +++ b/flower-0.8.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:982c2aff14b1b01024cf3356ff90309bc19fba99f47faba3cdb6c3262331c66e +size 2224949 diff --git a/flower-test_control.diff b/flower-test_control.diff deleted file mode 100644 index 71824f4..0000000 --- a/flower-test_control.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- flower-0.8.3/tests/api/test_control.py 2015-04-05 02:09:44.000000000 +0200 -+++ flower-0.8.4/tests/api/test_control.py 2016-01-19 02:55:07.000000000 +0100 -@@ -34,7 +34,12 @@ def test_pool_restart(self): - celery.control.broadcast = MagicMock(return_value=[{'test': 'ok'}]) - r = self.post('/api/worker/pool/restart/test', body={}) - self.assertEqual(200, r.code) -- celery.control.broadcast.assert_called_once() -+ celery.control.broadcast.assert_called_once_with( -+ 'pool_restart', -+ arguments={'reload': False}, -+ destination=['test'], -+ reply=True, -+ ) - - def test_pool_grow(self): - celery = self._app.capp diff --git a/python-flower.changes b/python-flower.changes index dd4ecae..038c470 100644 --- a/python-flower.changes +++ b/python-flower.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Wed Feb 20 08:09:01 UTC 2019 - John Vandenberg + +- Remove flower-test_control.diff merged upstream +- Add remove-faulty-test.patch for useless test case +- Add more missing runtime dependencies Babel & pytz not covered by tests +- Update to v0.8.4 + * Fix /api/tasks #460 + * Disable tornado access logs + * Fix #462 + * Improve error handling for unsupported brokers + * Make sure Babel is at least 1.0 + * Updated a test to use assert_called_once_with + * Updating readme for OAuth + * The viewer tasks, has been enhanced to display the key word arguments + and arguments showing now indented way information + * Add logging.NullHandler backport #501 + * Fix github auth python3 support #498 + * Use timezone from celery settings if configured. + * Add option `unix_socket`, deploy on docker and expose the sock file + * Discover tests in tests/*.py + * Fix bug, `events.Task.as_dict` is new in `Celery 3.1.7` + * events.Task.as_dict is new in Celery 3.1.7 + * Refactor /api/tasks/ #515 + * Use pprint instead of ast #491 + * Define CELERY_ACCEPT_CONTENT for examples + * Fix task searching #480 + ------------------------------------------------------------------- Sat Feb 16 02:31:41 UTC 2019 - John Vandenberg diff --git a/python-flower.spec b/python-flower.spec index c108a61..6c59f81 100644 --- a/python-flower.spec +++ b/python-flower.spec @@ -17,15 +17,15 @@ Name: python-flower -Version: 0.8.3 +Version: 0.8.4 Release: 0 Summary: A web frontend for monitoring and administrating Celery clusters License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/mher/flower Source: https://files.pythonhosted.org/packages/source/f/flower/flower-%{version}.tar.gz -Patch1: flower-test_control.diff -BuildRequires: %{python_module Babel} +Patch0: remove-faulty-test.patch +BuildRequires: %{python_module Babel >= 1.0} BuildRequires: %{python_module celery >= 2.5.0} BuildRequires: %{python_module certifi} BuildRequires: %{python_module kombu} @@ -35,8 +35,10 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module tornado >= 4.0.0} BuildRequires: fdupes BuildRequires: python-futures +Requires: python-Babel >= 1.0 Requires: python-celery >= 2.5.0 Requires: python-certifi +Requires: python-pytz Requires: python-tornado >= 4.0.0 Requires(post): update-alternatives Requires(postun): update-alternatives @@ -51,7 +53,8 @@ Flower is a web based tool for monitoring and administrating Celery clusters. %prep %setup -q -n flower-%{version} -%patch1 -p1 +%patch0 -p1 +sed -i 's/==/>=/' requirements/default.txt requirements/test.txt %build %python_build diff --git a/remove-faulty-test.patch b/remove-faulty-test.patch new file mode 100644 index 0000000..52ab086 --- /dev/null +++ b/remove-faulty-test.patch @@ -0,0 +1,14 @@ +--- flower-0.8.4/tests/test_command.py.orig 2019-02-20 15:47:03.279318000 +0700 ++++ flower-0.8.4/tests/test_command.py 2019-02-20 15:47:12.083402871 +0700 +@@ -1,11 +1 @@ +-import unittest + +-from tests import AsyncHTTPTestCase +-from flower.command import FlowerCommand +- +- +-class TestFlowerCommand(AsyncHTTPTestCase): +- def test_command(self): +- flower = FlowerCommand() +- #flower.execute_from_commandline() +- assert False