Skip to content

Commit

Permalink
Merge a1f78c7 into 8e8ba72
Browse files Browse the repository at this point in the history
  • Loading branch information
RaddishIoW committed Apr 25, 2019
2 parents 8e8ba72 + a1f78c7 commit fb84cfd
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 15 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ sudo: false
# Python versions for matrix
language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "3.7"

# Django versions for matrix
env:
- DJANGO_VERSION='>=1.8,<1.9'
- DJANGO_VERSION='>=1.9,<1.10'
- DJANGO_VERSION='>=1.10,<1.11'
#- DJANGO_VERSION='>=1.11,<1.12' Django 1.11 coming soon
- DJANGO_VERSION='>=1.11,<1.12'
- DJANGO_VERSION='>=2.0,<2.1'

# Command to install dependencies, e.g. pip install -r requirements.txt
install:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Requirements
------------

- Python 2.7, 3.3, 3.4, 3.5, or 3.6
- Django >= 1.9
- Django >= 1.10


Installation
Expand Down
7 changes: 3 additions & 4 deletions django_propeller/static/css/propeller.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion django_propeller/static/css/propeller.min.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions django_propeller/static/js/propeller.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion django_propeller/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from django.forms.formsets import formset_factory
from django.template import Context, Template
from django.test import TestCase
from django.core.urlresolvers import NoReverseMatch
from django.urls import NoReverseMatch

from .propeller import PROPELLER_SET_REQUIRED_SET_DISABLED
from .exceptions import PropellerError, PropellerException
Expand Down

0 comments on commit fb84cfd

Please sign in to comment.