Skip to content

Commit

Permalink
Fixed #65 Added Django 1.10 support
Browse files Browse the repository at this point in the history
  • Loading branch information
felixxm committed Jul 6, 2016
1 parent 7f433c0 commit 3446112
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env:
- TOXENV=py27-django17-test
- TOXENV=py27-django18-test
- TOXENV=py27-django19-test
- TOXENV=py27-django110-test
- TOXENV=py33-django15-test
- TOXENV=py33-django16-test
- TOXENV=py33-django17-test
Expand All @@ -14,10 +15,15 @@ env:
- TOXENV=py34-django17-test
- TOXENV=py34-django18-test
- TOXENV=py34-django19-test
- TOXENV=py34-django110-test
- TOXENV=py27-flake
- TOXENV=py33-flake
- TOXENV=py34-flake
- TOXENV=checkmanifest
matrix:
allow_failures:
- env: TOXENV=py27-django110-test
- env: TOXENV=py34-django110-test
install:
- pip install coveralls tox>=2.1
script:
Expand Down
7 changes: 3 additions & 4 deletions mailer/management/helpers.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
from optparse import make_option

from django.core.management.base import NoArgsCommand
from django.core.management.base import BaseCommand

help_msg = "If 1 don't print messagges, but only errors."


if NoArgsCommand.option_list:
if hasattr(BaseCommand, 'option_list') and BaseCommand.option_list:
# pre django 1.8; use optparse
class CronArgMixin(object):
base_options = (
make_option('-c', '--cron', default=0, type='int', help=help_msg),
)
option_list = NoArgsCommand.option_list + base_options
option_list = BaseCommand.option_list + base_options
else:
# django 1.8+; use argparse
class CronArgMixin(object):
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tox]
# Remember to add to .travis.yml if this is added to.
envlist =
py27-django{14,15,16,17,18,19}-test,
py27-django{14,15,16,17,18,19,110}-test,
py33-django{15,16,17,18}-test,
py34-django{15,16,17,18,19}-test,
py34-django{15,16,17,18,19,110}-test,
{py27,py33,py34}-flake,
checkmanifest,

Expand All @@ -29,7 +29,8 @@ deps =
django16: Django==1.6.11
django17: Django==1.7.11
django18: Django==1.8.13
django19: Django==1.9.6
django19: Django==1.9.7
django110: Django==1.10b1
flake: flake8

[testenv:checkmanifest]
Expand Down

0 comments on commit 3446112

Please sign in to comment.