Forráskód Böngészése

Drop Django 1.9 and Python 3.3 from CI

As agreed at https://groups.google.com/d/msg/wagtail-developers/nTn-rthPMsA/ORP3GA-hCQAJ
Matt Westcott 8 éve
szülő
commit
fef8b28089
2 módosított fájl, 1 hozzáadás és 30 törlés
  1. 0 27
      .travis.yml
  2. 1 3
      tox.ini

+ 0 - 27
.travis.yml

@@ -19,31 +19,8 @@ matrix:
      python: 2.7
    - env: TOXENV=py27-dj18-sqlite-noelasticsearch
      python: 2.7
-   - env: TOXENV=py33-dj18-postgres-noelasticsearch
-     python: 3.3
    - env: TOXENV=py35-dj18-postgres-noelasticsearch
      python: 3.5
-   - env: TOXENV=py27-dj19-postgres-noelasticsearch
-     python: 2.7
-   - env: TOXENV=py34-dj19-postgres-noelasticsearch
-     python: 3.4
-   - env: TOXENV=py35-dj19-postgres-noelasticsearch
-     python: 3.5
-   - env: TOXENV=py35-dj19-sqlite-noelasticsearch
-     python: 3.5
-   - env: TOXENV=py35-dj19-mysql-noelasticsearch
-     python: 3.5
-   - env: TOXENV=py27-dj19-postgres-elasticsearch
-     python: 2.7
-   - env: TOXENV=py27-dj19-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
-     python: 2.7
-     sudo: true
-   - env: TOXENV=py27-dj19-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
-     python: 2.7
-     sudo: true
-   - env: TOXENV=py34-dj19-sqlite-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
-     python: 3.5
-     sudo: true
    - env: TOXENV=py27-dj110-sqlite-noelasticsearch
      python: 2.7
    - env: TOXENV=py27-dj110-postgres-noelasticsearch
@@ -76,12 +53,8 @@ matrix:
    - env: TOXENV=py35-dj110head-postgres-noelasticsearch
      python: 3.5
   allow_failures:
-    - env: TOXENV=py27-dj19-postgres-elasticsearch
     - env: TOXENV=py35-dj110-postgres-elasticsearch
-    - env: TOXENV=py27-dj19-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
     - env: TOXENV=py35-dj110-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
-    - env: TOXENV=py27-dj19-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
-    - env: TOXENV=py34-dj19-sqlite-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
     - env: TOXENV=py27-dj110-mysql-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
     - env: TOXENV=py35-dj110-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
 

+ 1 - 3
tox.ini

@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True
 
-envlist = py{27,33,34,35}-dj{18,19}-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
+envlist = py{27,34,35}-dj18-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
           py{27,34,35}-dj{110,110head}-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
           flake8
 
@@ -16,7 +16,6 @@ commands =
 
 basepython =
     py27: python2.7
-    py33: python3.3
     py34: python3.4
     py35: python3.5
 
@@ -25,7 +24,6 @@ deps =
     Embedly
 
     dj18: Django>=1.8.1,<1.9
-    dj19: Django>=1.9,<1.10
     dj110: Django>=1.10a1,<1.11
     dj110head: git+https://github.com/django/django.git@stable/1.10.x#egg=Django
     postgres: psycopg2>=2.6