Drop python3.8 / Add python 3.13 (#314)

* drop python3.8, add python 3.13

* limit django <5.1 because code is broken

* use debian bookworm in dockerfile because there is bug in ubuntu spatialite < 5.0

Author: submarcos

.github/workflows/python-ci.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8  # check pylint with minimal supported python version
+          python-version: "3.10"
 
       - name: Install flake8
         run: |
@@ -35,13 +35,18 @@ jobs:
           flake8 mapentity test_project test_app
 
   test:
-    runs-on: ubuntu-20.04  # wait for spatialite fix
+    runs-on: ubuntu-latest
+    container:
+      image: python:${{ matrix.python-version }}-bookworm
+      env:
+        LANG: C.UTF-8
+
     strategy:
       matrix:
-        python-version: [ '3.8', '3.10', '3.12' ]
+        python-version: [ '3.9', '3.10', '3.13' ]
         django-version: [ '4.2.*', '5.0.*' ]
         exclude:
-            - python-version: '3.8'
+            - python-version: '3.9'
               django-version: '5.0.*'
 
     env:
@@ -53,19 +58,14 @@ jobs:
 
     - name: Install system dependencies
       run: |
-        sudo apt-get -qq update
-        sudo apt-get -y install gettext libproj-dev binutils gdal-bin libgdal-dev libsqlite3-mod-spatialite libcairo2 libpango-1.0-0 libpangocairo-1.0-0 libgdk-pixbuf2.0-0 libffi-dev shared-mime-info libpangoft2-1.0-0 libjpeg-dev libopenjp2-7-dev libsasl2-dev python3-dev libldap2-dev libssl-dev
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
+        apt-get -qq update
+        apt-get -y install gettext libproj-dev binutils gdal-bin libgdal-dev libsqlite3-mod-spatialite libcairo2 libpango-1.0-0 libpangocairo-1.0-0 libgdk-pixbuf2.0-0 libffi-dev shared-mime-info libpangoft2-1.0-0 libjpeg-dev libopenjp2-7-dev libsasl2-dev python3-dev libldap2-dev libssl-dev
 
     - name: Install python dependencies
       run: |
-        python -m pip install --upgrade pip setuptools wheel
-        pip install .[dev]
-        pip install Django==${{ matrix.django-version }} -U
+        python3 -m pip install --upgrade pip setuptools wheel
+        pip3 install .[dev]
+        pip3 install Django==${{ matrix.django-version }} -U
 
     - name: Compile messages
       run: |
@@ -99,7 +99,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.10"
 
       - name: Compile messages
         run: |

.github/workflows/sphinx.yml

@@ -16,9 +16,9 @@ env:
 jobs:
   doc:
     name: Documentation
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container:
-      image: python:3.8
+      image: python:3.10
       env:
         LANG: C.UTF-8
     steps:

CHANGES.md

@@ -5,6 +5,10 @@ CHANGELOG
 8.11.0+dev (XXXX-XX-XX)
 -----------------------
 
+**Improvements**
+
+- Add python 3.13 test suite
+- Drop python 3.8 test suite
 
 
 8.11.0      (2025-01-09)

Dockerfile

@@ -1,8 +1,8 @@
-FROM makinacorpus/geodjango:bionic-3.8
+FROM python:3.9-bookworm
 
 RUN apt-get update -qq && apt-get install -y -qq \
-    libsqlite3-mod-spatialite \
-    libjpeg62 libjpeg62-dev zlib1g-dev libcairo2 libpango-1.0-0 \
+    binutils libproj-dev gdal-bin libsqlite3-mod-spatialite \
+    libjpeg62 zlib1g-dev libcairo2 libpango-1.0-0 \
     libpangocairo-1.0-0 libgdk-pixbuf2.0-0 libffi-dev shared-mime-info \
     libldap2-dev libsasl2-dev && \
     apt-get clean all && rm -rf /var/apt/lists/* && rm -rf /var/cache/apt/*
@@ -14,7 +14,7 @@ RUN chown -R django:django /code
 COPY --chown=django:django . /code/src
 
 USER django
-RUN python3.8 -m venv /code/venv
+RUN python3.9 -m venv /code/venv
 
 WORKDIR /code/src
 

README.rst

@@ -7,7 +7,7 @@ that powers
 - `Georiviere <https://github.com/Georiviere/Georiviere-admin>`_.
 
 
-Works with Python 3.8+ and Django 3.2+
+Works with Python 3.9+ and Django 4.2+
 
 .. image:: https://img.shields.io/pypi/v/mapentity.svg
     :target: https://pypi.python.org/pypi/mapentity

setup.py

@@ -31,7 +31,7 @@
     install_requires=[
         'BeautifulSoup4',
         'cairocffi',
-        'Django',
+        'Django<5.1',
         'tzdata',
         'django-appypod',
         'django-compressor',
@@ -40,7 +40,7 @@
         'django-embed-video',
         'django-filter',
         'django-leaflet>=0.19,<0.20',  # leaflet 0.7.x
-        'django-modeltranslation<0.19.5',  # does not support python 3.8
+        'django-modeltranslation',
         'django-tinymce>=3',
         'django-weasyprint',
         'djangorestframework',
@@ -57,14 +57,14 @@
     tests_require=tests_require,
     extras_require={
         'dev': tests_require + [
-            'django-debug-toolbar<3.3', # 3.3.0 is not compatible with Django 2.2
+            'django-debug-toolbar',
             'flake8'
         ]
     },
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
-    python_requires='>=3.8',
+    python_requires='>=3.9',
     classifiers=['Topic :: Utilities',
                  'Natural Language :: English',
                  'Operating System :: OS Independent',

test_app/tests/test_serializers.py

@@ -2,7 +2,6 @@
 from io import StringIO
 from unittest.mock import patch
 
-from django import VERSION
 from django.conf import settings
 from django.contrib.gis import gdal
 from django.contrib.gis.db.models import GeometryField
@@ -13,7 +12,7 @@
 
 from mapentity.registry import app_settings
 from mapentity.serializers import ZipShapeSerializer, CSVSerializer
-from ..models import MushroomSpot, Tag, Supermarket
+from test_app.models import MushroomSpot, Tag, Supermarket
 
 
 class CommonShapefileSerializerMixin(object):
@@ -28,19 +27,21 @@ def getShapefileLayers(self):
 
 class MushroomShapefileSerializerTest(CommonShapefileSerializerMixin, TestCase):
     def setUp(self):
-        self.point1 = MushroomSpot.objects.create(serialized='SRID=%s;POINT(0 0)' % settings.SRID)
+        self.point1 = MushroomSpot.objects.create(serialized=f'SRID={settings.SRID};POINT(0 0)')
         self.point1.tags.add(Tag.objects.create(label="Tag1"))
         self.point1.tags.add(Tag.objects.create(label="Tag2"))
-        self.line1 = MushroomSpot.objects.create(serialized='SRID=%s;LINESTRING(0 0, 10 0)' % settings.SRID)
-        self.multipoint = MushroomSpot.objects.create(serialized='SRID=%s;MULTIPOINT((1 1), (2 2))' % settings.SRID)
-        self.multiline = MushroomSpot.objects.create(serialized='SRID=%s;MULTILINESTRING((1 1, 2 2), '
-                                                                '(3 3, 4 4))' % settings.SRID)
-        self.polygon = MushroomSpot.objects.create(serialized='SRID=%s;POLYGON((1 1, 2 2, '
-                                                              '1 2, 1 1))' % settings.SRID)
-        self.multipolygon = MushroomSpot.objects.create(serialized='SRID=%s;MULTIPOLYGON(((1 1, 2 2, '
-                                                                   '1 2, 1 1)))' % settings.SRID)
+        self.line1 = MushroomSpot.objects.create(serialized=f'SRID={settings.SRID};LINESTRING(0 0, 10 0)')
+        self.multipoint = MushroomSpot.objects.create(serialized=f'SRID={settings.SRID};MULTIPOINT((1 1), (2 2))')
+        self.multiline = MushroomSpot.objects.create(
+            serialized=f'SRID={settings.SRID};MULTILINESTRING((1 1, 2 2), (3 3, 4 4))'
+        )
+        self.polygon = MushroomSpot.objects.create(serialized=f'SRID={settings.SRID};POLYGON((1 1, 2 2, 1 2, 1 1))')
+        self.multipolygon = MushroomSpot.objects.create(
+            serialized=f'SRID={settings.SRID};MULTIPOLYGON(((1 1, 2 2, 1 2, 1 1)))'
+        )
         self.geometrycollection = MushroomSpot.objects.create(
-            serialized='SRID=%s;GEOMETRYCOLLECTION(POINT(0 0), POLYGON((1 1, 2 2, 1 2, 1 1))))' % settings.SRID)
+            serialized=f'SRID={settings.SRID};GEOMETRYCOLLECTION(POINT(0 0), POLYGON((1 1, 2 2, 1 2, 1 1))))'
+        )
         MushroomSpot.geomfield = GeometryField(name='geom', srid=settings.SRID)
 
         self.serializer = ZipShapeSerializer()
@@ -188,10 +189,7 @@ def test_serializer_foreign_key(self):
         layers = self.getShapefileLayers()
         layer = layers['Polygon.shp']
         feature = layer[0]
-        if VERSION[0] >= 3:
-            self.assertEqual(feature['tag'].value, None)
-        else:
-            self.assertEqual(feature['tag'].value, "")
+        self.assertEqual(feature['tag'].value, None)
 
         self.serializer = ZipShapeSerializer()
         tag = Tag.objects.create(label="Tag")

test_app/tests/test_templatetags.py

@@ -1,19 +1,18 @@
+import json
+import os
+from datetime import datetime
+
 from django.conf import settings
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.exceptions import FieldDoesNotExist
 from django.template import Template, Context
 from django.template.exceptions import TemplateSyntaxError
 from django.test import TestCase
-from django.test.utils import override_settings
 from django.utils.timezone import make_aware
+from freezegun import freeze_time
 
-from ..models import DummyModel
 from .factories import DummyModelFactory
-
-from datetime import datetime
-from freezegun import freeze_time
-import json
-import os
-from tempfile import TemporaryDirectory
+from ..models import DummyModel
 
 
 class ValueListTest(TestCase):
@@ -224,14 +223,12 @@ def test_few_seconds_ago(self):
 
 class MediaStaticFallbackPathTest(TestCase):
     def test_media_static_fallback_path(self):
-        d = TemporaryDirectory()
-        with override_settings(STATIC_ROOT=d.name):
-            out = Template(
-                '{% load mapentity_tags %}'
-                '{% media_static_fallback_path "doesnotexist.png" "foo.png" %}'
-            ).render(Context({}))
+        out = Template(
+            '{% load mapentity_tags %}'
+            '{% media_static_fallback_path "doesnotexist.png" "foo.png" %}'
+        ).render(Context({}))
 
-        self.assertEqual(os.path.join(d.name, 'foo.png'), out)
+        self.assertEqual(staticfiles_storage.path("foo.png"), out)
 
     def test_media_static_find_path(self):
         with open(os.path.join(settings.MEDIA_ROOT, 'exist.png'), mode='wb') as f: