Skip to content

Commit

Permalink
Add support for Django 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
RevolutionTech committed Dec 12, 2017
1 parent f59188e commit 0748d19
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
- DJANGO_VERSION=1.9.13
- DJANGO_VERSION=1.10.8
- DJANGO_VERSION=1.11.8
- DJANGO_VERSION=2.0

install:
- pip install -q Django==$DJANGO_VERSION
Expand All @@ -21,6 +22,11 @@ after_success:
- bash <(curl -s https://codecov.io/bash)

matrix:
exclude:
- python: 2.7
env: DJANGO_VERSION=2.0
include:
- python: 3.6
env: DJANGO_VERSION=1.11.8
- python: 3.6
env: DJANGO_VERSION=2.0
2 changes: 1 addition & 1 deletion conditions/tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class UserProfile(models.Model):

user = models.OneToOneField(User)
user = models.OneToOneField(User, on_delete=models.CASCADE)
level = models.IntegerField(default=1)


Expand Down
2 changes: 1 addition & 1 deletion docs/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ django-conditions is a Django app that allows creation of conditional logic in a
- In a game, define the winning objectives of a mission/quest
- and many more...

django-conditions supports Django 1.8-1.11 and Python 2.7, 3.4-3.6.
django-conditions supports Django 1.8-2.0 and Python 2.7, 3.4-3.6.
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ def run(self):


requirements = [
'Django >= 1.8, < 2.0a0',
'Django >= 1.8, < 2.1a0',
'django-jsonfield >= 1.0.1, < 2.0.0a0',
]


setup(
name='django-conditions',
version='0.9.12',
version='0.9.13',
packages=find_packages(),
include_package_data=True,
license='ISC License',
Expand All @@ -65,6 +65,7 @@ def run(self):
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Intended Audience :: Developers',
'License :: OSI Approved',
'License :: OSI Approved :: BSD License',
Expand Down

0 comments on commit 0748d19

Please sign in to comment.