Skip to content

Commit

Permalink
Merge e049cb6 into 488a676
Browse files Browse the repository at this point in the history
  • Loading branch information
dodobas committed Aug 1, 2019
2 parents 488a676 + e049cb6 commit 34bec32
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ sudo: true
python:
- 3.5
- 3.6
- 3.7

env:
- DJANGO_VERSION=1.11.18 PGDB=9.6
- DJANGO_VERSION=1.11.18 PGDB=10
- DJANGO_VERSION=2.0.10 PGDB=9.6
- DJANGO_VERSION=2.0.10 PGDB=10
- DJANGO_VERSION=2.1.5 PGDB=9.6
- DJANGO_VERSION=2.1.5 PGDB=10
- DJANGO_VERSION=2.1.11 PGDB=9.6
- DJANGO_VERSION=2.1.11 PGDB=10
- DJANGO_VERSION=2.2.4 PGDB=9.6
- DJANGO_VERSION=2.2.4 PGDB=10

before_install:
- sudo -E service postgresql stop 9.2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Smartmin tries to stay in lock step with the latest Django versions. With each n
will be released and we will save the major changes (possibly breaking backwards compatibility) on these versions. This
includes updating to the latest version of Twitter Bootstrap.

The latest version is the 2.1.* series which works against Django 1.11, 2.0 and 2.1.
The latest version is the 2.2.* series which supports the Django 2.1.* and 2.2.* releases series.

About
=====
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
celery
django>=1.11,<2.2
django>=2.1,<3.0
django_compressor
pytz
redis
Expand Down

0 comments on commit 34bec32

Please sign in to comment.