Skip to content

Commit

Permalink
Merge d9eae05 into bf772f6
Browse files Browse the repository at this point in the history
  • Loading branch information
YPCrumble committed Jul 22, 2019
2 parents bf772f6 + d9eae05 commit e37fe50
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
27 changes: 24 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
dist: xenial
language: python
python:
- "2.7"
- "3.4"
- "3.4.10"
- "3.5"
- "3.6"
- "3.7"
env:
- DJANGO=1.7
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
- DJANGO=1.11
- DJANGO=1.11.17
- DJANGO=2.0
- DJANGO=2.1
- DJANGO=2.2
install:
# command to install dependencies
- "pip install coveralls"
Expand All @@ -24,11 +29,27 @@ matrix:
exclude:
- python: "2.7"
env: DJANGO=2.0
- python: "2.7"
env: DJANGO=2.1
- python: "2.7"
env: DJANGO=2.2
- python: "3.4"
env: DJANGO=2.1
- python: "3.4"
env: DJANGO=2.2
- python: "3.5"
env: DJANGO=1.7
- python: "3.6"
env: DJANGO=1.7


- python: "3.7"
env: DJANGO=1.7
- python: "3.7"
env: DJANGO=1.8
- python: "3.7"
env: DJANGO=1.9
- python: "3.7"
env: DJANGO=1.10
- python: "3.7"
env: DJANGO=1.11
after_success:
- coveralls
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Nomenclature of this specification is based on the Activity Streams Spec: `<http
Requirements
============

- Python 2.7, 3.4, 3.5, 3.6
- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0
- Python 2.7, 3.4, 3.5, 3.6, 3.7
- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1, 2.2

Installation
============
Expand Down
9 changes: 7 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
envlist =
py{27,33,34}-django17
py{27,33,34,35,36}-django{18,19,110,111}
py{34,35,36}-django200
py{37}-django{111}
py{34,35,36,37}-django200
py{35,36,37}-django210
py{35,36,37}-django220

[testenv]
commands =
Expand All @@ -15,4 +18,6 @@ deps =
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0
django200: Django>=2.0,<3.0
django200: Django>=2.0,<2.1
django210: Django>=2.1,<2.2
django220: Django>=2.2,<3.0

0 comments on commit e37fe50

Please sign in to comment.