Merge pull request #3306 from GeotrekCE/optimize_zoning_intersections

Cache API v2 and optimizations

.github/workflows/test.yml

@@ -15,6 +15,11 @@ on:
   release:
     types:
       - created
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   DEBIAN_FRONTEND: noninteractive
   POSTGRES_DB: ci_test
@@ -116,9 +121,9 @@ jobs:
         pip3 wheel --wheel-dir=~/.wheel_dir -r requirements.txt
         pip3 install --find-links=~/.wheel_dir -r requirements.txt
 
-    - name: Create test log directory
+    - name: Create test required directories
       run: |
-        mkdir -p ./var/log
+        mkdir -p ./var/log ./var/cache/sessions
 
     - name: Check migrations
       run: |

Dockerfile

@@ -15,7 +15,7 @@ ENV CAPTURE_HOST="screamshotter"
 ENV CUSTOM_SETTINGS_FILE="/opt/geotrek-admin/var/conf/custom.py"
 
 WORKDIR /opt/geotrek-admin
-RUN mkdir -p /opt/geotrek-admin/var/log
+RUN mkdir -p /opt/geotrek-admin/var/log /opt/geotrek-admin/var/cache
 
 # Install postgis because raster2pgsl is required by manage.py loaddem
 RUN apt-get update -qq && apt-get install -y -qq  \
@@ -49,7 +49,7 @@ RUN /opt/venv/bin/pip install --no-cache-dir -r requirements.txt -U
 COPY geotrek/ geotrek/
 COPY manage.py manage.py
 COPY VERSION VERSION
-COPY .coveragerc .coveragerc
+COPY setup.cfg setup.cfg
 COPY docker/* /usr/local/bin/
 
 ENTRYPOINT ["/bin/sh", "-e", "/usr/local/bin/entrypoint.sh"]

debian/dirs

@@ -1,4 +1,5 @@
 /opt/geotrek-admin/var/conf/extra_static
 /opt/geotrek-admin/var/log
+/opt/geotrek-admin/var/cache/sessions
 /opt/geotrek-admin/var/media/upload
 /opt/geotrek-admin/var/pid