Merge pull request #3357 from GeotrekCE/dep_python_mapentity

⬆️ Bump python to 3.8, mapentity to 8.3.0

.github/workflows/doc.yml

@@ -21,7 +21,7 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     container:
-      image: python:3.6
+      image: python:3.8
       env:
         LANG: C.UTF-8
     steps:

.github/workflows/lint.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.6
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6  # lint with minimal version supported (3.6 in 18.04)
+          python-version: 3.8  # lint with minimal version supported (3.8 in 18.04)
 
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
         tests-env: ['tests', 'tests_nds']
         include:
           - os: ubuntu-18.04
-            python-version: 3.6  # default python version in 18.04
+            python-version: 3.8  # default python version in 18.04
           - os: ubuntu-20.04
             python-version: 3.8  # default python version in 20.04
 
@@ -112,7 +112,8 @@ jobs:
              libpango1.0-0 \
              libpangocairo-1.0-0 \
              libgdk-pixbuf2.0-dev \
-             libffi-dev
+             libffi-dev \
+             libvips
         sudo apt-get install -y --no-install-recommends postgis
 
     - name: Install python dependencies
@@ -181,7 +182,7 @@ jobs:
         - name: Install build dependencies
           run: |
             apt-get -q update
-            apt-get -q -y install dpkg-dev debhelper dh-virtualenv git python3 python3-venv python3-dev libffi-dev libxml2-dev libxslt1-dev libgdal-dev
+            apt-get -q -y install dpkg-dev debhelper dh-virtualenv git python3.8 python3.8-venv python3.8-dev libffi-dev libxml2-dev libxslt1-dev libgdal-dev
         - name: Building package debian 18.04
           run: |
             dpkg-buildpackage -uc -us -b

Dockerfile

@@ -37,7 +37,8 @@ RUN apt-get update -qq && apt-get install -y -qq  \
     libpango1.0-0 \
     libpangocairo-1.0-0 \
     libgdk-pixbuf2.0-dev \
-    libffi-dev && \
+    libffi-dev \
+    libvips && \
     apt-get install -y --no-install-recommends postgis && \
     apt-get clean all && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
 

debian/control

@@ -7,9 +7,9 @@ Build-Depends:
  debhelper (>= 9),
  dh-virtualenv (>= 1.0),
  git,
- python3 (>= 3.6),
- python3-venv (>= 3.6),
- python3-dev (>= 3.6),
+ python3.8 (>= 3.8),
+ python3.8-venv (>= 3.8),
+ python3.8-dev (>= 3.8),
  libgdal-dev (>= 2.2),
  libffi-dev (>= 3),
  libxml2-dev (>= 2.9.2),
@@ -33,5 +33,7 @@ Depends:
  redis-server,
  screamshotter (>= 2.0.9),
  screamshotter (<< 3.0.0),
- convertit
+ convertit,
+ python3.8 (>= 3.8),
+ libvips
 Description: Manage and promote your tourist trails and activites

debian/rules

@@ -7,7 +7,7 @@ export DH_VIRTUALENV_INSTALL_ROOT=/opt
 
 override_dh_virtualenv:
 	dh_virtualenv \
-	--python /usr/bin/python3 \
+	--python /usr/bin/python3.8 \
 	--upgrade-pip \
 	--builtin-venv \
 	--extra-pip-arg --no-cache-dir \

docs/changelog.rst

@@ -5,6 +5,19 @@ CHANGELOG
 2.94.0+dev (XXXX-XX-XX)
 -----------------------
 
+**Warning**
+
+Bionic (Ubuntu 18.04) instances need to install deadsnakes PPA to handle python3.8:
+``apt-get install software-properties-common``
+``add-apt-repository --yes ppa:deadsnakes/ppa``
+``apt-get install python3.8``
+
+**Maintenance**
+
+In preparation for HD Views developments (PR #3298)
+- Bump Python to 3.8
+- Bump MapEntity to 8.3.0
+- Add libvips to dependencies
 
 2.94.0     (2022-12-12)
 -----------------------

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.6
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    pip-compile
@@ -20,8 +20,6 @@ billiard==3.6.4.0
     # via celery
 btrees==4.10.0
     # via zodb
-cached-property==1.5.2
-    # via kombu
 cairocffi==0.9.0
     # via
     #   cairosvg
@@ -193,10 +191,7 @@ html5lib==1.1
 idna==3.3
     # via requests
 importlib-metadata==4.8.3
-    # via
-    #   kombu
-    #   markdown
-    #   redis
+    # via markdown
 inflection==0.5.1
     # via drf-yasg
 itypes==1.2.0
@@ -209,7 +204,7 @@ landez==2.5.0
     # via geotrek (setup.py)
 lxml==4.9.1
     # via mapentity
-mapentity==8.2.1
+mapentity==8.3.0
     # via geotrek (setup.py)
 markdown==3.3.7
     # via geotrek (setup.py)
@@ -285,10 +280,10 @@ requests==2.27.1
     #   mapentity
 rjsmin==1.2.0
     # via django-compressor
-ruamel.yaml==0.17.21
+ruamel-yaml==0.17.21
     # via drf-yasg
-ruamel.yaml.clib==0.2.6
-    # via ruamel.yaml
+ruamel-yaml-clib==0.2.6
+    # via ruamel-yaml
 sentry-sdk==1.5.9
     # via geotrek (setup.py)
 simplekml==1.3.6
@@ -319,13 +314,6 @@ tinycss2==1.1.1
     #   weasyprint
 transaction==3.0.1
     # via zodb
-typing-extensions==4.1.1
-    # via
-    #   asgiref
-    #   async-timeout
-    #   faker
-    #   importlib-metadata
-    #   redis
 uritemplate==4.1.1
     # via
     #   coreapi
@@ -359,7 +347,7 @@ xlrd==2.0.1
     # via geotrek (setup.py)
 xmltodict==0.12.0
     # via tif2geojson
-zc.lockfile==2.0
+zc-lockfile==2.0
     # via zodb
 zconfig==3.6.0
     # via zodb
@@ -369,7 +357,7 @@ zodb==5.7.0
     # via appy
 zodbpickle==2.2.0
     # via zodb
-zope.interface==5.4.0
+zope-interface==5.4.0
     # via
     #   btrees
     #   datetime

setup.py

@@ -33,7 +33,7 @@ def run(self):
     scripts=['manage.py'],
     install_requires=[
         'Django==3.2.*',
-        'mapentity==8.2.1',
+        'mapentity==8.3.0',
         'cairosvg',
         'cairocffi==0.9.0',  # Latest version dh-virtualenv can handle to build the .deb package
         'env_file',