django 2.0

Author: nwolff

.travis.yml

@@ -3,19 +3,19 @@ language: python
 matrix:
   include:
   - python: '3.5'
-    env: TOXENV=py35-django111-flake
-  - python: '3.4'
-    env: TOXENV=py34-django110-test
-  - python: '3.5'
-    env: TOXENV=py35-django110-test
-  - python: '3.6'
-    env: TOXENV=py36-django110-test
+    env: TOXENV=py35-django20-flake
   - python: '3.4'
     env: TOXENV=py34-django111-test
   - python: '3.5'
     env: TOXENV=py35-django111-test
   - python: '3.6'
     env: TOXENV=py36-django111-test
+  - python: '3.4'
+    env: TOXENV=py34-django20-test
+  - python: '3.5'
+    env: TOXENV=py35-django20-test
+  - python: '3.6'
+    env: TOXENV=py36-django20-test
 install:
 - pip install tox
 script:

README.md

@@ -4,7 +4,7 @@ django-variable-resolution-date
 [![Build Status](https://travis-ci.org/skioo/django-variable-resolution-date.svg?branch=master)](https://travis-ci.org/skioo/django-variable-resolution-date)
 [![PyPI version](https://badge.fury.io/py/django-variable-resolution-date.svg)](https://badge.fury.io/py/django-variable-resolution-date)
 [![Requirements Status](https://requires.io/github/skioo/django-variable-resolution-date/requirements.svg?branch=master)](https://requires.io/github/skioo/django-variable-resolution-date/requirements/?branch=master)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 
 A django field that can represent either a year, or a year and a month, or a full calendar date.

setup.cfg

@@ -1,4 +1,4 @@
 [flake8]
-exclude = .git, .tox, .env, */migrations/*
+exclude = .git, .tox, .env
 max-line-length = 119
 

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='django-variable-resolution-date',
-    version='0.1.5',
+    version='0.1.6',
     description='A django field that can represent either a year, or a year and a month, or a full calendar date',
     long_description='',
     author='Nicholas Wolff',
@@ -14,14 +14,14 @@
         'variable_resolution_date',
     ],
     install_requires=[
-        'Django>=1.10',
+        'Django>=1.11',
     ],
     licence='MIT',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    {py34,py35,py36}-{django110,django111}-test
-    py35-django111-{flake}
+    {py34,py35,py36}-{django111,django20}-test
+    py35-django20-{flake}
 
 [testenv]
 basepython =
@@ -12,8 +12,8 @@ commands =
     test: py.test tests
     flake: flake8
 deps =
-    django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
+    django20: Django>=2.0,<2.1
     pytest-django
     flake: flake8
 

variable_resolution_date/__init__.py

@@ -14,10 +14,10 @@
 
 import datetime
 
+import re
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.encoding import force_text
-import re
 
 VARIABLE_RESOLUTION_DATE_RE = re.compile(r'^(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?$')
 VARIABLE_RESOLUTION_DATE_LENGTH = 10
@@ -32,7 +32,7 @@ def validate_variable_resolution_date(value):
         try:
             datetime.date(year, month, day)
             return
-        except:
+        except Exception:
             pass
     raise ValidationError('Enter a year, year-month, or year-month-day.')