Merge pull request #39 from submarcos/update_python_django

Drop django 2.2 and python 3.6, add django 4.2 and python 3.11
submarcos · May 24, 2023 · 90d6861 · 90d6861
2 parents 9ca7731 + 3e0e44c
commit 90d6861
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 24 deletions.
diff --git a/.github/workflows/python-lint.yml b/.github/workflows/python-lint.yml
@@ -12,7 +12,7 @@ jobs:
   flake8:
     runs-on: ubuntu-latest
     container:
-      image: python:3.6
+      image: python:3.7
       env:
         LANG: C.UTF-8
     steps:
@@ -28,7 +28,7 @@ jobs:
   isort:
     runs-on: ubuntu-latest
     container:
-      image: python:3.6
+      image: python:3.7
       env:
         LANG: C.UTF-8
 
@@ -45,7 +45,7 @@ jobs:
   black:
     runs-on: ubuntu-latest
     container:
-      image: python:3.6
+      image: python:3.7
       env:
         LANG: C.UTF-8
 
@@ -62,7 +62,7 @@ jobs:
   doc:
     runs-on: ubuntu-latest
     container:
-      image: python:3.6
+      image: python:3.7
       env:
         LANG: C.UTF-8
 

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -10,14 +10,14 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.6
+          python-version: 3.7
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -13,20 +13,18 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ['3.6', '3.10']
-        django-version: ['2.2.*', '3.2.*', '4.1.*']
+        python-version: ['3.7', '3.8', '3.11']
+        django-version: ['3.2.*', '4.2.*']
         postgis-image: ['postgis/postgis:10-2.5', 'postgis/postgis:11-2.5', 'postgis/postgis:latest']
         exclude:
-          - python-version: '3.10'  # 3.10 is not supported by django 2.2
-            django-version: '2.2.*'
-          - postgis-image: 'postgis/postgis:11-2.5'
-            django-version: '2.2.*'  # test only with 10-2.5 and latest
           - postgis-image: 'postgis/postgis:11-2.5'
             django-version: '3.2.*'  # test only with 10-2.5 and latest
-          - python-version: '3.6'
-            django-version: '4.1.*'  # Django 4.1 supports only python >= 3.8
+          - python-version: '3.7'
+            django-version: '4.2.*'  # Django 4.2 supports only python >= 3.8
           - postgis-image: 'postgis/postgis:10-2.5'
-            django-version: '4.1.*'  # Django 4.1 supports only postgres >= 11
+            django-version: '4.2.*'  # Django 4.2 supports only postgres >= 12
+          - postgis-image: 'postgis/postgis:11-2.5'
+            django-version: '4.2.*'  # Django 4.2 supports only postgres >= 12
 
     services:
       postgres:

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ![Tests](https://github.com/submarcos/django-vectortiles/workflows/Python%20/%20Django%20matrix%20test/badge.svg)
 [![Coverage](https://codecov.io/gh/submarcos/django-vectortiles/branch/master/graph/badge.svg)](https://codecov.io/gh/submarcos/django-vectortiles)
 
-![Python Version](https://img.shields.io/badge/python-%3E%3D%203.6-blue.svg)
-![Django Version](https://img.shields.io/badge/django-%3E%3D%202.2-blue.svg)
+![Python Version](https://img.shields.io/badge/python-%3E%3D%203.7-blue.svg)
+![Django Version](https://img.shields.io/badge/django-%3E%3D%203.2-blue.svg)
 
 # Generate MapBox VectorTiles from GeoDjango models
 

diff --git a/setup.py b/setup.py
@@ -44,11 +44,11 @@
         'Operating System :: OS Independent',
         'Development Status :: 5 - Production/Stable',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10'
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11'
     ],
     python_requires='>=3.6',
     install_requires=[

diff --git a/test_vectortiles/test_app/migrations/0001_initial.py b/test_vectortiles/test_app/migrations/0001_initial.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/test_vectortiles/test_app/migrations/0002_auto_20201020_1615.py b/test_vectortiles/test_app/migrations/0002_auto_20201020_1615.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("test_app", "0001_initial"),
     ]

diff --git a/test_vectortiles/test_app/migrations/0003_feature_date.py b/test_vectortiles/test_app/migrations/0003_feature_date.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("test_app", "0002_auto_20201020_1615"),
     ]

diff --git a/test_vectortiles/test_app/migrations/0004_alter_feature_layer.py b/test_vectortiles/test_app/migrations/0004_alter_feature_layer.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("test_app", "0003_feature_date"),
     ]

diff --git a/test_vectortiles/test_app/migrations/0005_alter_feature_date.py b/test_vectortiles/test_app/migrations/0005_alter_feature_date.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("test_app", "0004_alter_feature_layer"),
     ]