From dda45717cf0d46421ffe0ea1f71876ec509315cc Mon Sep 17 00:00:00 2001 From: Filipe Ximenes Date: Fri, 25 Aug 2017 15:10:29 -0300 Subject: [PATCH 1/3] fixes setup.py --- celerybeat_status/__init__.py | 2 +- setup.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/celerybeat_status/__init__.py b/celerybeat_status/__init__.py index 6d6f592..969baf9 100644 --- a/celerybeat_status/__init__.py +++ b/celerybeat_status/__init__.py @@ -1,5 +1,5 @@ __title__ = 'CeleryBeat Status' -__version__ = '0.0.3' +__version__ = '0.0.5' __author__ = 'Vinta Software' __license__ = 'MIT License' __copyright__ = 'Copyright 2017 Vinta Serviços e Soluções Tecnológicas Ltda' diff --git a/setup.py b/setup.py index fc7e794..4ca7699 100755 --- a/setup.py +++ b/setup.py @@ -8,17 +8,13 @@ from setuptools import setup +long_description = '' try: from pypandoc import convert - - def read_md(f): - return convert(f, 'rst') + long_description = convert('README.md', 'rst') except ImportError: print("warning: pypandoc module not found, could not convert Markdown to RST") - def read_md(f): - return open(f, 'r', encoding='utf-8').read() - def get_version(package): """ @@ -80,7 +76,7 @@ def get_package_data(package): version=version, license='MIT', description='A simple django admin extension that shows when your periodic are going to run next', - long_description=read_md('README.md'), + long_description=long_description, author='Vinta Software', author_email='contact@vinta.com.br', packages=get_packages('celerybeat_status'), From 620e0eef4472d65bf114256ae2d145f6b623107f Mon Sep 17 00:00:00 2001 From: Filipe Ximenes Date: Fri, 25 Aug 2017 15:11:16 -0300 Subject: [PATCH 2/3] updates version --- celerybeat_status/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/celerybeat_status/__init__.py b/celerybeat_status/__init__.py index 969baf9..0e47f33 100644 --- a/celerybeat_status/__init__.py +++ b/celerybeat_status/__init__.py @@ -1,5 +1,5 @@ __title__ = 'CeleryBeat Status' -__version__ = '0.0.5' +__version__ = '0.0.6' __author__ = 'Vinta Software' __license__ = 'MIT License' __copyright__ = 'Copyright 2017 Vinta Serviços e Soluções Tecnológicas Ltda' From 228fde12c115df5b2dccd7af91327acc5b7f3110 Mon Sep 17 00:00:00 2001 From: hugobessa Date: Wed, 30 Aug 2017 21:05:19 -0300 Subject: [PATCH 3/3] fixes periodic_tasks_status_list template error on tasks name --- .../templates/celerybeat_status/periodic_tasks_status_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html b/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html index 3cbb679..909b905 100644 --- a/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html +++ b/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html @@ -24,7 +24,7 @@
  • {% trans 'Is due?' %} {% if task.is_due %} {% trans 'Yes' %} {% else %} {% trans 'No' %} {% endif %}
  • {% trans 'Next execution:' %} {{ task.next_execution | date:"m/d/Y fa e" }}
  • -
  • {% trans 'Task:' %} {{ task.next_execution | date:"m/d/Y fa e" }}
  • +
  • {% trans 'Task:' %} {{ task.task }}
  • {% trans 'Arguments:' %} {{ task.args }}
  • {% trans 'Keyword Arguments:' %} {{ task.kwargs }}