diff --git a/.bumpversion.cfg b/.bumpversion.cfg index dfbed5d..950c94e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -9,7 +9,4 @@ serialize = [bumpversion:file:django_celery_monitor/__init__.py] -[bumpversion:file:docs/includes/introduction.txt] - [bumpversion:file:README.rst] - diff --git a/.gitignore b/.gitignore index 42bed40..0ec4d19 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ Documentation/ .pydevproject .idea/ .coverage -celery/tests/cover/ .ve* cover/ .vagrant/ diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3fc41c4..23a9b10 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,15 @@ Change history ================ +.. _version-1.0.1: + +:release-date: 2017-05-03 08:35 a.m. UTC+2 +:release-by: Jannis Leidel + +- Fix the Python package manifest. + +- Fix README rendering. + .. _version-1.0.0: 1.0.0 @@ -13,9 +22,9 @@ - Initial release by extracting the monitor code from the old django-celery app. -- Added ability to override the expiry timedelta for the task monitor via the +- Add ability to override the expiry timedelta for the task monitor via the Celery configuration. -- Added Python 3.6 and Django 1.11 to text matrix. Supported versions of Django +- Add Python 3.6 and Django 1.11 to text matrix. Supported versions of Django 1.8 LTS, 1.9, 1.10 and 1.11 LTS. Supported versions of Python are 2.7, 3.4, 3.5 and 3.6 (for Django 1.11). diff --git a/MANIFEST.in b/MANIFEST.in index 7902927..739912f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,17 +1,21 @@ +include .bumpversion.cfg +include .coveragerc +include .editorconfig +include AUTHORS include CHANGELOG.rst include LICENSE include README.rst include MANIFEST.in +include Makefile include setup.cfg include setup.py include manage.py +include tox.ini recursive-include docs * -recursive-include extra/* -recursive-include examples * -recursive-include requirements *.txt *.rst -recursive-include django_celery_monitor *.py - +recursive-include requirements *.txt recursive-include tests *.py +recursive-include django_celery_monitor *.css +recursive-include django_celery_monitor *.html recursive-exclude * __pycache__ recursive-exclude * *.py[co] recursive-exclude * .*.sw* diff --git a/README.rst b/README.rst index 65c21be..69c3d5b 100644 --- a/README.rst +++ b/README.rst @@ -47,26 +47,6 @@ To install using `pip`,: $ pip install -U django-celery-monitor -.. _installing-from-source: - -Downloading and installing from source --------------------------------------- - -Download the latest version of django-celery-monitor from -http://pypi.python.org/pypi/django_celery_monitor - -You can install it by doing the following,: - -.. code-block:: console - - $ tar xvfz django-celery-monitor-0.0.0.tar.gz - $ cd django-celery-monitor-0.0.0 - $ python setup.py build - # python setup.py install - -The last command must be executed as a privileged user if -you are not currently using a virtualenv. - Usage ===== @@ -79,7 +59,7 @@ To use this with your project you need to follow these steps: $ pip install django_celery_monitor #. Add ``django_celery_monitor`` to ``INSTALLED_APPS`` in your - Django project's :file:`settings.py`:: + Django project's ``settings.py``:: INSTALLED_APPS = ( ...,