Merge 32a32ac into 854ac59

makinacorpus · Nov 30, 2020 · dd2f181 · dd2f181
2 parents 854ac59 + 32a32ac
commit dd2f181
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 105 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         django_version: [ '1.11', '2.0', '2.1', '2.2', '3.0', '3.1' ]
-        python_version: [ '3.4', '3.5', '3.6', '3.7', '3.8', '3.9' ]
+        python_version: [ '3.5', '3.6', '3.7', '3.8', '3.9' ]
         database: [ 'postgres' ]
         exclude:
           - django_version: '1.11'
@@ -29,23 +29,14 @@ jobs:
           - django_version: '2.0'
             python_version: '3.9'
 
-          - django_version: '2.1'
-            python_version: '3.4'
           - django_version: '2.1'
             python_version: '3.8'
           - django_version: '2.1'
             python_version: '3.9'
 
-          - django_version: '2.2'
-            python_version: '3.4'
-
-          - django_version: '3.0'
-            python_version: '3.4'
           - django_version: '3.0'
             python_version: '3.5'
 
-          - django_version: '3.1'
-            python_version: '3.4'
           - django_version: '3.1'
             python_version: '3.5'
         include:

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.rst b/README.rst
@@ -19,9 +19,6 @@ It embeds Leaflet version *1.6.0*.
 .. image:: https://img.shields.io/pypi/dm/django-leaflet.svg
         :target: https://pypi.python.org/pypi/django-leaflet
 
-.. image:: https://travis-ci.org/makinacorpus/django-leaflet.png
-    :target: https://travis-ci.org/makinacorpus/django-leaflet
-
 .. image:: https://coveralls.io/repos/makinacorpus/django-leaflet/badge.png
     :target: https://coveralls.io/r/makinacorpus/django-leaflet
 

diff --git a/setup.py b/setup.py
@@ -39,7 +39,6 @@
         'Framework :: Django',
         'Development Status :: 5 - Production/Stable',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

diff --git a/tox.ini b/tox.ini
@@ -23,15 +23,3 @@ deps =
     coverage
 passenv = DATABASE SPATIALITE_LIBRARY_PATH
 
-[travis:env]
-DJANGO =
-    1.11: django111
-    2.0: django20
-    2.1: django21
-    2.2: django22
-    3.0: django30
-    3.1: django31
-    master: djangomaster
-
-DATABASE =
-    postgres: postgres