Fix the test environment (#118)

* Add missing doc strings.

This fixes the errors in the "pydocstyle" test environment.

* Run coverage against Python 3.

This is required because Django > 2.0 is installed by default (support for Python 2 has been dropped in Django 2.0).

* Install "sphinx_celery" from the master branch.

We need the fix from celery/sphinx_celery@28d8f42 which has not been released yet.

* Run "apicheck" test environment against Python 3.

The "apicheck" test environment installs the latest release of "Django" through "requirements/docs.txt", which no longer supports Python 2.

* Enable the "linkcheck" test environment.

The "linkcheck" test environment installs the latest release of "Django" through "requirements/docs.txt", which no longer supports Python 2. So it needs to be run with Python 3.

* Install "ephem" in the test suite.

This fixes the tests failing due to the missing "ephem" library, which has been removed in #94.

* Make "pypy" test environment work on Travis.

Author: mbaechtold

Diff for: .travis.yml

@@ -2,31 +2,26 @@ language: python
 sudo: false
 cache: false
 python:
-    - '3.5'
-os:
-    - linux
+  - 2.7
+  - 3.4
+  - 3.5
+  - pypy
 env:
-  global:
-    PYTHONUNBUFFERED=yes
-  matrix:
-    - TOXENV=2.7-django1.10
-    - TOXENV=2.7-django1.9
-    - TOXENV=2.7-django1.8
-    - TOXENV=pypy-django1.10
-    - TOXENV=pypy-django1.9
-    - TOXENV=pypy-django1.8
-    - TOXENV=3.4-django1.10
-    - TOXENV=3.4-django1.9
-    - TOXENV=3.4-django1.8
-    - TOXENV=3.5-django1.10
-    - TOXENV=3.5-django1.9
-    - TOXENV=3.5-django1.8
-    - TOXENV=flake8
-    - TOXENV=flakeplus
-    - TOXENV=apicheck
-    - TOXENV=pydocstyle
-    - TOXENV=cov
-install: travis_retry pip install -U tox
+  - DJANGO=1.8
+  - DJANGO=1.9
+  - DJANGO=1.10
+  - DJANGO=1.11
+os:
+  - linux
+matrix:
+  include:
+    - { python: 2.7, env: TOXENV=flake8 }
+    - { python: 2.7, env: TOXENV=flakeplus }
+    - { python: 2.7, env: TOXENV=pydocstyle }
+    - { python: 3.5, env: TOXENV=apicheck }
+    - { python: 3.5, env: TOXENV=linkcheck }
+    - { python: 3.5, env: TOXENV=cov }
+install: travis_retry pip install -U tox-travis
 services: rabbitmq
 script: tox -v -- -v
 after_success:

Diff for: django_celery_beat/schedulers.py

@@ -53,6 +53,7 @@ class ModelEntry(ScheduleEntry):
     save_fields = ['last_run_at', 'total_run_count', 'no_changes']
 
     def __init__(self, model, app=None):
+        """Initialize the model entry."""
         self.app = app or current_app._get_current_object()
         self.name = model.name
         self.task = model.task
@@ -177,6 +178,7 @@ class DatabaseScheduler(Scheduler):
     _initial_read = False
 
     def __init__(self, *args, **kwargs):
+        """Initialize the database scheduler."""
         self._dirty = set()
         Scheduler.__init__(self, *args, **kwargs)
         self._finalize = Finalize(self, self.sync, exitpriority=5)

Diff for: requirements/docs.txt

@@ -1,2 +1,2 @@
-sphinx_celery>=1.1
+https://github.com/celery/sphinx_celery/archive/master.zip
 Django>=1.10

Diff for: tox.ini

@@ -1,28 +1,24 @@
 [tox]
 envlist =
-    2.7-django1.11
-    2.7-django1.10
-    2.7-django1.9
-    2.7-django1.8
-    pypy-django1.11
-    pypy-django1.10
-    pypy-django1.9
-    pypy-django1.8
-    3.4-django1.11
-    3.4-django1.10
-    3.4-django1.9
-    3.4-django1.8
-    3.5-django1.11
-    3.5-django1.10
-    3.5-django1.9
-    3.5-django1.8
+    py27-django{18,19,110,111}
+    py34-django{18,19,110,111}
+    py35-django{18,19,110,111}
+    pypy-django{18,19,110,111}
 
     flake8
     flakeplus
     apicheck
+    linkcheck
     pydocstyle
     cov
 
+[travis:env]
+DJANGO =
+    1.8: django18
+    1.9: django19
+    1.10: django110
+    1.11: django111
+
 [testenv]
 deps=
     -r{toxinidir}/requirements/default.txt
@@ -31,10 +27,12 @@ deps=
 
     cov: -r{toxinidir}/requirements/test-django.txt
 
-    django1.11: -r{toxinidir}/requirements/test-django111.txt
-    django1.10: -r{toxinidir}/requirements/test-django110.txt
-    django1.9: -r{toxinidir}/requirements/test-django19.txt
-    django1.8: -r{toxinidir}/requirements/test-django18.txt
+    django111: -r{toxinidir}/requirements/test-django111.txt
+    django110: -r{toxinidir}/requirements/test-django110.txt
+    django19: -r{toxinidir}/requirements/test-django19.txt
+    django18: -r{toxinidir}/requirements/test-django18.txt
+
+    py{27,34,35,py},cov: ephem
 
     linkcheck,apicheck: -r{toxinidir}/requirements/docs.txt
     flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt
@@ -45,34 +43,33 @@ commands =
     pip install -U https://github.com/celery/kombu/zipball/master#egg=kombu
     py.test -xv
 
-basepython =
-    2.7,flake8,flakeplus,apicheck,linkcheck,pydocstyle,cov: python2.7
-    3.4: python3.4
-    3.5: python3.5
-    pypy: pypy
-    pypy3: pypy3
-
 [testenv:apicheck]
+basepython = python3.5
 commands =
     sphinx-build -W -b apicheck -d {envtmpdir}/doctrees docs docs/_build/apicheck
 
 [testenv:linkcheck]
+basepython = python3.5
 commands =
     sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs docs/_build/linkcheck
 
 [testenv:flake8]
+basepython = python2.7
 commands =
     flake8 {toxinidir}/django_celery_beat {toxinidir}/t
 
 [testenv:flakeplus]
+basepython = python2.7
 commands =
     flakeplus --2.7 {toxinidir}/django_celery_beat {toxinidir}/t
 
 [testenv:pydocstyle]
+basepython = python2.7
 commands =
     pydocstyle {toxinidir}/django_celery_beat
 
 [testenv:cov]
+basepython = python3.5
 usedevelop = true
 commands =
     pip install -U https://github.com/celery/celery/zipball/master#egg=celery