Merge pull request #47 from ambitioninc/develop

3.1.0

.travis.yml

@@ -1,22 +1,45 @@
-sudo: false
 language: python
+
+sudo: false
+
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
+
 env:
-  global:
-    - DB=postgres
   matrix:
-    - DJANGO=">=1.9,<1.10"
-    - DJANGO=">=1.10,<1.11"
-    - DJANGO=">=1.11,<2.0"
+    - DJANGO=1.11
+    - DJANGO=2.0
+    - DJANGO=master
+
+addons:
+  postgresql: '9.5'
+
+matrix:
+  include:
+    - { python: "3.6", env: TOXENV=flake8 }
+
+  exclude:
+    - { python: "2.7", env: DJANGO=master }
+    - { python: "2.7", env: DJANGO=2.0 }
+    - { python: "3.4", env: DJANGO=master }
+
+  allow_failures:
+    - env: DJANGO=master
+
 install:
-  - pip install -q coverage flake8 psycopg2 Django$DJANGO django-nose>=1.4
+    - pip install tox-travis
+
 before_script:
   - psql -c 'CREATE DATABASE localized_recurrence;' -U postgres
+
 script:
-  - flake8 .
-  - coverage run setup.py test
-  - coverage report --fail-under=100
+    - tox
+
+after_success:
+  coveralls
+
+notifications:
+    email: false

localized_recurrence/version.py

@@ -1 +1 @@
-__version__ = '2.2.1'
+__version__ = '3.1.0'

publish.py

@@ -1,5 +1,10 @@
 import subprocess
 
+subprocess.call(['rm', '-r', 'dist/'])
 subprocess.call(['pip', 'install', 'wheel'])
+subprocess.call(['pip', 'install', 'twine'])
 subprocess.call(['python', 'setup.py', 'clean', '--all'])
-subprocess.call(['python', 'setup.py', 'register', 'sdist', 'bdist_wheel', 'upload'])
+subprocess.call(['python', 'setup.py', 'register', 'sdist', 'bdist_wheel'])
+subprocess.call(['twine', 'upload', 'dist/*'])
+subprocess.call(['rm', '-r', 'dist/'])
+subprocess.call(['rm', '-r', 'build/'])

requirements/requirements-testing.txt

@@ -0,0 +1,6 @@
+coverage
+coveralls
+django-nose
+django-dynamic-fixture
+mock
+psycopg2

setup.py

@@ -31,23 +31,20 @@ def get_version():
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
     install_requires=[
-        'Django>=1.9',
-        'ambition-django-timezone-field>=2.0.1',
+        'Django>=1.11',
+        'ambition-django-timezone-field>=2.0.2',
         'fleming>=0.4.6',
         'python-dateutil',
         'pytz',

tox.ini

@@ -0,0 +1,28 @@
+[tox]
+envlist =
+    flake8
+    py{27,34,35,36}-django111
+    py{34,35,36}-django20
+    py{35,36}-djangomaster
+
+[testenv]
+setenv =
+    DB = postgres
+deps =
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
+    -rrequirements/requirements-testing.txt
+commands =
+    coverage run setup.py test
+    coverage report --fail-under=100
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 localized_recurrence
+
+[travis:env]
+DJANGO =
+    1.11: django111
+    2.0: django20
+    master: djangomaster