Merge pull request #949 from SamR1/ci-update-postgres-version

SamR1 · web-flow · commit e36f824f7e65 · 2025-10-04T19:24:56.000+02:00
CI - add support for PostgreSQL 18
diff --git a/.github/workflows/.e2e-tests.yml b/.github/workflows/.e2e-tests.yml
@@ -20,7 +20,7 @@ jobs:
     container: python:${{ inputs.python-version }}
     services:
       postgres:
-        image: postgis/postgis:${{ inputs.postgres-version }}-${{ inputs.postgis-version }}
+        image: postgis/postgis:${{ inputs.postgres-version }}-${{ inputs.postgis-version }}-alpine
         env:
           POSTGRES_DB: fittrackee_test
           POSTGRES_USER: fittrackee
diff --git a/.github/workflows/.tests-and-publish-python.yml b/.github/workflows/.tests-and-publish-python.yml
@@ -38,12 +38,12 @@ env:
 jobs:
   python:
     if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
-    name: python ${{ matrix.python-version }} (postgresql 17 - postgis 3.5)
+    name: python ${{ matrix.python-version }} (postgis 17-3.5)
     runs-on: ubuntu-latest
     container: python:${{ matrix.python-version }}
     services:
       postgres:
-        image: postgis/postgis:17-3.5
+        image: postgis/postgis:17-3.5-alpine
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -100,12 +100,12 @@ jobs:
 # needs cffi 2+ for Python 3.14 support
 #  python-next:
 #    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
-#    name: python 3.14-rc (postgresql 17)
+#    name: python 3.14-rc (postgis 17-3.5)
 #    runs-on: ubuntu-latest
 #    container: python:3.14-rc
 #    services:
 #      postgres:
-#        image: postgres:17
+#        image: postgis/postgis:17-3.5-alpine
 #        env:
 #          POSTGRES_PASSWORD: postgres
 #        options: >-
@@ -130,14 +130,14 @@ jobs:
 #      - name: Pytest
 #        run: pytest fittrackee -n auto --maxprocesses=2  -p no:warnings --maxfail=1
 
-  postgresql:
+  postgis:
     if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
-    name: postgresql/postgis ${{ matrix.psql-version }} (python 3.10)
+    name: postgis ${{ matrix.psql-version }} (python 3.10)
     runs-on: ubuntu-latest
     container: python:3.10
     services:
       postgres:
-        image: postgis/postgis:${{ matrix.psql-version }}
+        image: postgis/postgis:${{ matrix.psql-version }}-alpine
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -147,7 +147,40 @@ jobs:
           --health-retries 5
     strategy:
       matrix:
-        psql-version:  [ "13-3.5", "14-3.5", "15-3.5", "16-3.5", "17-3.4", "17-3.6-alpine", "18rc1-3.6-alpine" ]
+        psql-version:  [ "13-3.5", "14-3.5", "15-3.5", "16-3.5", "17-3.4", "17-3.6", "18-3.6" ]
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Install Poetry and Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install --quiet poetry
+          poetry config virtualenvs.create false
+          poetry install --no-interaction --quiet
+
+      - name: Create test databases
+        run: python db/create_ci_test_db.py
+
+      - name: Pytest
+        run: pytest fittrackee -n auto --maxprocesses=2 -p no:warnings --maxfail=1
+
+
+  arm:
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.fork }}
+    name: postgis 17-3.5 on arm platform (python 3.13)
+    runs-on: ubuntu-24.04-arm
+    container: python:3.13
+    services:
+      postgres:
+        image: imresamu/postgis:17-3.5-alpine
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
 
       - uses: actions/checkout@v4
@@ -173,7 +206,7 @@ jobs:
     container: python:3.13
     services:
       postgres:
-        image: postgis/postgis:17-3.5
+        image: postgis/postgis:17-3.5-alpine
         env:
           POSTGRES_DB: fittrackee_test
           POSTGRES_USER: fittrackee
@@ -278,7 +311,7 @@ jobs:
   publish-to-pypi:
     if: github.repository == 'SamR1/FitTrackee' && startsWith(github.ref, 'refs/tags/v')
     name: Publish Python distribution to PyPI
-    needs: ["postgresql", "end2end", "end2end_package", "end2end_package_update"]
+    needs: ["postgis", "arm", "end2end", "end2end_package", "end2end_package_update"]
     runs-on: ubuntu-latest
     environment:
       name: pypi
@@ -341,7 +374,7 @@ jobs:
   push_to_registries:
     if: github.repository == 'SamR1/FitTrackee' && startsWith(github.ref, 'refs/tags/v')
     name: Push Docker image to multiple registries
-    needs: ["postgresql", "end2end", "end2end_package", "end2end_package_update"]
+    needs: ["postgis", "arm", "end2end", "end2end_package", "end2end_package_update"]
     runs-on: ubuntu-latest
     permissions:
       contents: read
diff --git a/.github/workflows/.tests-javascript.yml b/.github/workflows/.tests-javascript.yml
@@ -62,7 +62,7 @@ jobs:
     container: python:3.13
     services:
       postgres:
-        image: postgis/postgis:17-3.5
+        image: postgis/postgis:17-3.5-alpine
         env:
           POSTGRES_DB: fittrackee_test
           POSTGRES_USER: fittrackee
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![Vue Version](https://img.shields.io/badge/vue-3.5-brightgreen.svg)](https://v3.vuejs.org/) 
 [![code formatter: prettier](https://img.shields.io/badge/code%20formatter-prettier-ff69b4.svg)](https://github.com/prettier/prettier) 
 [![Typescript Version](https://img.shields.io/npm/types/typescript)](https://www.typescriptlang.org/)  
-[![PostgreSQL version](https://img.shields.io/badge/PostgreSQL-13_|_14_|_15_|_16_|_17-336791)](https://www.postgresql.org/)  
+[![PostgreSQL version](https://img.shields.io/badge/PostgreSQL-13_|_14_|_15_|_16_|_17_|_18-336791)](https://www.postgresql.org/) [![PostgreSQL version](https://img.shields.io/badge/PostGIS-3.4_|_3.5_|_3.6-5b7b9f)](https://postgis.net/)  
 [![PyPI version](https://img.shields.io/pypi/v/fittrackee?logo=pypi)](https://pypi.org/project/fittrackee/) [![docker image version](https://img.shields.io/docker/v/fittrackee/fittrackee?logo=docker)](https://hub.docker.com/r/fittrackee/fittrackee)  
 [![Coverage Status](https://coveralls.io/repos/github/SamR1/FitTrackee/badge.svg?branch=master)](https://coveralls.io/github/SamR1/FitTrackee?branch=master)<sup><sup>1</sup></sup> [![pipeline status](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-and-publish-python.yml/badge.svg)](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-and-publish-python.yml)
 [![pipeline status](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-javascript.yml/badge.svg)](https://github.com/SamR1/FitTrackee/actions/workflows/.tests-javascript.yml)  
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -10,6 +10,8 @@
 services:
   fittrackee-db:
     container_name: fittrackee-db
+    # Note: there is no official image for PostGIS on ARM CPUs yet.
+    # The workaround is to build PostGIS image locally.
     image: postgis/postgis:17-3.5-alpine
     ports:
       - "5435:5432"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,6 +10,15 @@
 services:
   fittrackee-db:
     container_name: fittrackee-db
+    # Always backup the database before FitTrackee upgrade when the new version
+    # includes database migrations.
+    #
+    # Please refer to the PostgreSQL and PostGIS documentation before upgrading
+    # image version.
+    #
+    # Warning: there is no official image for PostGIS on ARM CPUs yet, see:
+    # https://github.com/postgis/docker-postgis/issues/216
+    # The workaround is to build PostGIS image locally.
     image: postgis/postgis:17-3.5-alpine
     env_file:
       - .env
diff --git a/fittrackee/tests/fixtures/fixtures_geometries.py b/fittrackee/tests/fixtures/fixtures_geometries.py
@@ -1,72 +1,75 @@
 import pytest
+from shapely import Polygon
 
 
 @pytest.fixture()
-def paris_with_10km_buffer() -> str:
-    return (
-        "POLYGON ((2.362431123843492 48.85348618457388, "
-        "2.362376683159058 48.85260412906315, "
-        "2.3621914976517617 48.851729841960484, "
-        "2.361877357400467 48.85087174253842, "
-        "2.3614372939000803 48.85003809376014, "
-        "2.3608755506302987 48.84923692274121, "
-        "2.3601975419801815 48.84847594349699, "
-        "2.359409800932117 48.84776248271795, "
-        "2.3585199160156343 48.847103409284585, "
-        "2.357536458143191 48.84650506819859, "
-        "2.3564688980357236 48.845973219562836, "
-        "2.3553275150343875 48.84551298319479, "
-        "2.3541232981759137 48.84512878940347, "
-        "2.352867840481537 48.84482433640062, "
-        "2.3515732274729673 48.844602554753436, "
-        "2.350251920982787 48.844465579218486, "
-        "2.348916639370555 48.84441472822586, "
-        "2.3475802352893482 48.84445049120967, "
-        "2.3462555721702842 48.844572523905505, "
-        "2.3449554006044746 48.84477965166013, "
-        "2.3436922358027883 48.845069880721375, "
-        "2.342478237303791 48.84544041740063, "
-        "2.3413250920792525 48.845887694924905, "
-        "2.3402439021549983 48.84640740772136, "
-        "2.3392450778227274 48.84699455280758, "
-        "2.338338237466221 48.84764347789083, "
-        "2.3375321149634742 48.848347935716944, "
-        "2.3368344755552615 48.849101144148385, "
-        "2.3362520409910985 48.849895851396326, "
-        "2.3357904246761776 48.850724405781705, "
-        "2.3354540774484014 48.85157882935648, "
-        "2.3352462445139537 48.85245089467849, "
-        "2.335168933963819 48.85333220400302, "
-        "2.3352228971832982 48.85421427012996, "
-        "2.335407621352846 48.85508859812885, "
-        "2.3357213341225465 48.855946767155544, "
-        "2.336161020425368 48.856780511571976, "
-        "2.336722451277105 48.8575818005873, "
-        "2.3374002242947487 48.85834291565157, "
-        "2.338187815551136 48.85905652485485, "
-        "2.339077642273151 48.85971575361278, "
-        "2.3400611357847176 48.86031425095466, "
-        "2.3411288239953136 48.86084625077276, "
-        "2.3422704226408513 48.861306627439774, "
-        "2.3434749343975185 48.86169094525505, "
-        "2.3447307549113074 48.8619955012407, "
-        "2.3460257847175616 48.86221736087195, "
-        "2.3473475459663953 48.86235438639535, "
-        "2.348683302822128 48.862405257459756, "
-        "2.350020184368339 48.862369483859744, "
-        "2.3513453088251945 48.86224741026767, "
-        "2.352645907872629 48.862040212908404, "
-        "2.353909449871892 48.861749888209, "
-        "2.355123760788927 48.861379233533334, "
-        "2.356277141645912 48.86093182018901, "
-        "2.3573584813618034 48.86041195896831, "
-        "2.358357363888493 48.85982465855751, "
-        "2.359264168605826 48.85917557721837, "
-        "2.3600701630054024 48.858470968209936, "
-        "2.3607675867693834 48.85771761947954, "
-        "2.361349726435341 48.85692278820765, "
-        "2.3618109799308575 48.85609413083947, "
-        "2.362146910360975 48.85523962928065, "
-        "2.3623542885368094 48.85436751397021, "
-        "2.362431123843492 48.85348618457388))"
+def paris_with_10km_buffer() -> Polygon:
+    return Polygon(
+        (
+            (2.362431123843492, 48.85348618457388),
+            (2.362376683159058, 48.85260412906315),
+            (2.3621914976517617, 48.851729841960484),
+            (2.361877357400467, 48.85087174253842),
+            (2.3614372939000803, 48.85003809376014),
+            (2.3608755506302987, 48.84923692274121),
+            (2.3601975419801815, 48.84847594349699),
+            (2.359409800932117, 48.84776248271795),
+            (2.3585199160156343, 48.847103409284585),
+            (2.357536458143191, 48.84650506819859),
+            (2.3564688980357236, 48.845973219562836),
+            (2.3553275150343875, 48.84551298319479),
+            (2.3541232981759137, 48.84512878940347),
+            (2.352867840481537, 48.84482433640062),
+            (2.3515732274729673, 48.844602554753436),
+            (2.350251920982787, 48.844465579218486),
+            (2.348916639370555, 48.84441472822586),
+            (2.3475802352893482, 48.84445049120967),
+            (2.3462555721702842, 48.844572523905505),
+            (2.3449554006044746, 48.84477965166013),
+            (2.3436922358027883, 48.845069880721375),
+            (2.342478237303791, 48.84544041740063),
+            (2.3413250920792525, 48.845887694924905),
+            (2.3402439021549983, 48.84640740772136),
+            (2.3392450778227274, 48.84699455280758),
+            (2.338338237466221, 48.84764347789083),
+            (2.3375321149634742, 48.848347935716944),
+            (2.3368344755552615, 48.849101144148385),
+            (2.3362520409910985, 48.849895851396326),
+            (2.3357904246761776, 48.850724405781705),
+            (2.3354540774484014, 48.85157882935648),
+            (2.3352462445139537, 48.85245089467849),
+            (2.335168933963819, 48.85333220400302),
+            (2.3352228971832982, 48.85421427012996),
+            (2.335407621352846, 48.85508859812885),
+            (2.3357213341225465, 48.855946767155544),
+            (2.336161020425368, 48.856780511571976),
+            (2.336722451277105, 48.8575818005873),
+            (2.3374002242947487, 48.85834291565157),
+            (2.338187815551136, 48.85905652485485),
+            (2.339077642273151, 48.85971575361278),
+            (2.3400611357847176, 48.86031425095466),
+            (2.3411288239953136, 48.86084625077276),
+            (2.3422704226408513, 48.861306627439774),
+            (2.3434749343975185, 48.86169094525505),
+            (2.3447307549113074, 48.8619955012407),
+            (2.3460257847175616, 48.86221736087195),
+            (2.3473475459663953, 48.86235438639535),
+            (2.348683302822128, 48.862405257459756),
+            (2.350020184368339, 48.862369483859744),
+            (2.3513453088251945, 48.86224741026767),
+            (2.352645907872629, 48.862040212908404),
+            (2.353909449871892, 48.861749888209),
+            (2.355123760788927, 48.861379233533334),
+            (2.356277141645912, 48.86093182018901),
+            (2.3573584813618034, 48.86041195896831),
+            (2.358357363888493, 48.85982465855751),
+            (2.359264168605826, 48.85917557721837),
+            (2.3600701630054024, 48.858470968209936),
+            (2.3607675867693834, 48.85771761947954),
+            (2.361349726435341, 48.85692278820765),
+            (2.3618109799308575, 48.85609413083947),
+            (2.362146910360975, 48.85523962928065),
+            (2.3623542885368094, 48.85436751397021),
+            (2.362431123843492, 48.85348618457388),
+        )
     )
diff --git a/fittrackee/tests/workouts/test_utils/test_geometry.py b/fittrackee/tests/workouts/test_utils/test_geometry.py
@@ -1,6 +1,8 @@
 from typing import TYPE_CHECKING
 
 import pytest
+import shapely.wkt
+from shapely import set_precision
 
 from fittrackee.workouts.exceptions import (
     InvalidCoordinatesException,
@@ -17,6 +19,7 @@
 
 if TYPE_CHECKING:
     from flask import Flask
+    from shapely import Polygon
 
     from fittrackee.users.models import User
     from fittrackee.workouts.models import Sport, Workout, WorkoutSegment
@@ -511,12 +514,19 @@ def test_it_raises_exception_when_coordinates_are_invalid(
 
     @pytest.mark.parametrize("input_radius", ["1", "1.0"])
     def test_it_returns_buffered_polygon_with_4326_srid(
-        self, app: "Flask", paris_with_10km_buffer: str, input_radius: str
+        self,
+        app: "Flask",
+        paris_with_10km_buffer: "Polygon",
+        input_radius: str,
     ) -> None:
         paris_coordinates = "48.85341,2.3488"
 
         buffer = get_buffered_location(paris_coordinates, input_radius)
 
         srid, geometry = buffer.split(";")
         assert srid == "SRID=4326"
-        assert geometry == paris_with_10km_buffer
+        # to handle rounding differences on different platforms
+        precision = 1e-10
+        assert str(
+            set_precision(shapely.wkt.loads(geometry), precision)
+        ) == str(set_precision(paris_with_10km_buffer, precision))
