Skip to content
Permalink
Browse files

Added Django 2.2 and Django 3.0 to supported versions table.

  • Loading branch information...
atombrella committed Sep 26, 2019
1 parent fd5b421 commit e0fd29da32e5455b2b47a51974416fd419aeb4fe
Showing with 16 additions and 39 deletions.
  1. +9 −30 .travis.yml
  2. +4 −2 README.rst
  3. +3 −7 tox.ini
@@ -1,19 +1,11 @@
#cache: pip
cache: pip

language: python

matrix:
include:
- python: 3.5
dist: trusty
sudo: false
env: DJANGO="1.11"
- python: 3.5
dist: trusty
sudo: false
env: DJANGO="2.0"
- python: 3.5
dist: trusty
dist: xenial
sudo: false
env: DJANGO="2.1"
- python: 3.5
@@ -22,39 +14,26 @@ matrix:
env: DJANGO="2.2"

- python: 3.6
dist: trusty
sudo: false
env: DJANGO="1.11"
- python: 3.6
dist: trusty
sudo: false
env: DJANGO="2.0"
- python: 3.6
dist: trusty
dist: xenial
sudo: false
env: DJANGO="2.1"
- python: 3.6
dist: xenial
sudo: false
env: DJANGO="2.2"

- python: 3.7
- python: 3.6
dist: xenial
sudo: true
env: DJANGO="2.0"
sudo: false
env: DJANGO="3.0"

- python: 3.7
dist: xenial
sudo: true
env: DJANGO="2.1"
env: DJANGO="2.2"
- python: 3.7
dist: xenial
sudo: true
env: DJANGO="2.2"

- python: pypy
dist: trusty
sudo: false
env: DJANGO="1.11"
env: DJANGO="3.0"

addons:
apt:
@@ -26,6 +26,8 @@ The below table explains which Django versions are supported.
+------------------+----------------+--------------+
| Release | Django | Upgrade from |
+==================+================+==============+
| 0.5.x (DEV) | 2.1, 2.2, 3.0 | 0.4 |
+------------------+----------------+--------------+
| 0.4.x | 1.11, 2.0, 2.1 | 0.3 |
+------------------+----------------+--------------+
| 0.3.x | 1.8, 1.9, | 0.2 |
@@ -128,7 +130,7 @@ Docs

See the docs/ folder, or read them at:

http://django-wiki.readthedocs.io/en/latest/
https://django-wiki.readthedocs.io/en/latest/

If you wish to add something, please ask in the google group or raise an
issue if you're in doubt about whether something might change.
@@ -183,7 +185,7 @@ on your host system.
- `django-sekizai <https://github.com/ojii/django-sekizai/>`__
- `sorl-thumbnail <https://github.com/mariocesar/sorl-thumbnail>`__
- `Pillow (Python Imaging Library) <https://pillow.readthedocs.io/en/latest/installation.html>`__
- Python>=3.4
- Python>=3.5



10 tox.ini
@@ -1,6 +1,6 @@
[tox]
# Ensure you add to .travis.yml if you add here, using `tox -l`
envlist = {py35,py36}-django{111,20,21,22},py37-django{20,21,22},lint
envlist = {py35,py36,py37}-django{21,22},{py36,py37,py38}-django{30},lint

[travis]
python =
@@ -10,10 +10,8 @@ python =

[travis:env]
DJANGO =
1.11: django111
2.0: django20
2.1: django21
2.2: django22
3.0: django30
LINT =
yes: lint

@@ -34,17 +32,15 @@ usedevelop = false

deps =
.[test]
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
django30: Django>=3.0a1,<3.1

basepython =
py35: python3.5
py36: python3.6
py37: python3.7


[testenv:lint]
basepython = python3
deps = .[testlint]

0 comments on commit e0fd29d

Please sign in to comment.
You can’t perform that action at this time.