Merge c6d26a0 into 50da8e0

javrasya · Jan 31, 2021 · 6fae98a · 6fae98a
2 parents 50da8e0 + c6d26a0
commit 6fae98a
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,85 +2,109 @@ sudo: false
 matrix:
   include:
     - language: python
-      python: "2.7"
+      python: "3.5"
       cache: pip
-      env: TOXENV=py27-dj1.11
+      env: TOXENV=py35-dj2.2
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.5"
+      python: "3.6"
       cache: pip
-      env: TOXENV=py35-dj1.11
+      env: TOXENV=py36-dj2.2
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.5"
+      python: "3.6"
       cache: pip
-      env: TOXENV=py35-dj2.0
+      env: TOXENV=py36-dj3.0
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.5"
+      python: "3.6"
       cache: pip
-      env: TOXENV=py35-dj2.1
+      env: TOXENV=py36-dj3.1
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.5"
+      python: "3.7"
       cache: pip
-      env: TOXENV=py35-dj2.2
+      env: TOXENV=py37-dj2.2
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.6"
+      python: "3.7"
       cache: pip
-      env: TOXENV=py36-dj1.11
+      env: TOXENV=py37-dj3.0
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.6"
+      python: "3.7"
       cache: pip
-      env: TOXENV=py36-dj2.0
+      env: TOXENV=py37-dj3.1
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.6"
+      python: "3.8"
       cache: pip
-      env: TOXENV=py36-dj2.1
+      env: TOXENV=py38-dj2.2
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.6"
+      python: "3.8"
       cache: pip
-      env: TOXENV=py36-dj2.2
+      env: TOXENV=py38-dj3.0
       install:
         - pip install tox-travis
       script:
         - tox
     - language: python
-      python: "3.6"
+      python: "3.8"
       cache: pip
-      env: TOXENV=py36-dj3.0
+      env: TOXENV=py38-dj3.1
       install:
         - pip install tox-travis
       script:
-        - tox        
+        - tox
+    - language: python
+      python: "3.9"
+      cache: pip
+      env: TOXENV=py39-dj2.2
+      install:
+        - pip install tox-travis
+      script:
+        - tox
+    - language: python
+      python: "3.9"
+      cache: pip
+      env: TOXENV=py39-dj3.0
+      install:
+        - pip install tox-travis
+      script:
+        - tox
+    - language: python
+      python: "3.9"
+      cache: pip
+      env: TOXENV=py39-dj3.1
+      install:
+        - pip install tox-travis
+      script:
+        - tox
     - language: python
       python: "3.6"
       cache: pip

diff --git a/README.rst b/README.rst
@@ -1,5 +1,5 @@
-.. |Build Status| image:: https://travis-ci.org/javrasya/river-admin.svg?branch=master
-    :target: https://travis-ci.org/javrasya/river-admin
+.. |Build Status| image:: https://travis-ci.com/javrasya/river-admin.svg?branch=master
+    :target: https://travis-ci.com/javrasya/river-admin
 
 .. |Doc Status| image:: https://readthedocs.org/projects/river-admin/badge/?version=latest
     :target: https://river-admin.readthedocs.io/en/latest/?badge=latest

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,5 +1,5 @@
-.. |Build Status| image:: https://travis-ci.org/javrasya/river-admin.svg?branch=master
-    :target: https://travis-ci.org/javrasya/river-admin
+.. |Build Status| image:: https://travis-ci.com/javrasya/river-admin.svg?branch=master
+    :target: https://travis-ci.com/javrasya/river-admin
 
 .. |Doc Status| image:: https://readthedocs.org/projects/river-admin/badge/?version=latest
     :target: https://river-admin.readthedocs.io/en/latest/?badge=latest

diff --git a/tox.ini b/tox.ini
@@ -1,20 +1,16 @@
 [tox]
-envlist = {py27}-{dj1.11},
-          {py35}-{dj1.11,dj2.0,dj2.1,dj2.2},
-          {py36}-{dj1.11,dj2.0,dj2.1,dj2.2,dj3.0},
+envlist = {py35}-{dj2.2},
+          {py36, py37, p6y38, py39}-{dj2.2, dj3.0, dj3.1}
           cov
 
 [testenv]
 deps =
-    {py27}: whitenoise<5.0
     pytest-django
     pytest-cov
     -rrequirements.txt
-    dj1.11: Django>=1.11,<1.12.0
-    dj2.0: Django>=2.0,<2.1.0
-    dj2.1: Django>=2.1,<2.2.0
     dj2.2: Django>=2.2,<2.3.0
     dj3.0: Django>=3.0,<3.1.0
+    dj3.1: Django>=3.1,<3.2.0
 commands =
     py.test --ds='test_settings' --junitxml=../junit-{envname}.xml