Merge remote-tracking branch 'origin/long-term/remove-tp' into 215787…

…_drop_cash_assist

.github/helpers/.env-selenium

@@ -1,11 +1,11 @@
-REDIS_INSTANCE=redis:6379
 PYTHONUNBUFFERED=1
 SECRET_KEY=secretkey
 ENV=dev
 DEBUG=true
 CELERY_BROKER_URL=redis://redis:6379/0
 CELERY_RESULT_BACKEND=redis://redis:6379/0
 CACHE_LOCATION=redis://redis:6379/1
+CONSTANCE_REDIS_CONNECTION=redis://redis:6379/0
 DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
 USE_DUMMY_EXCHANGE_RATES=yes
 CELERY_TASK_ALWAYS_EAGER=true

.github/helpers/.env-unit

@@ -12,5 +12,6 @@ KOBO_KF_URL=https://kobo.humanitarianresponse.info
 KOBO_KC_URL=https://kobo.humanitarianresponse.info
 KOBO_MASTER_API_TOKEN=token
 EXCHANGE_RATES_API_KEY=token
-REDIS_INSTANCE=redis:6379
+CACHE_LOCATION=redis://redis:6379/1
+CONSTANCE_REDIS_CONNECTION=redis://redis:6379/0
 PYTHONUNBUFFERED=1

.github/helpers/docker-compose.selenium.yml

@@ -31,7 +31,7 @@ services:
       - backend-web-app:/tmp/
     command: |
       sh -c "
-        cp -r /packages/__pypackages__/3.11/lib/hct_mis_api/apps/web/* /tmp/
+        cp -r /packages/__pypackages__/3.12/lib/hct_mis_api/apps/web/* /tmp/
       "
     restart: "no"
 

.github/workflows/ci.yml

@@ -207,7 +207,7 @@ jobs:
             --push ./"
           
           if [ "${{ github.ref }}" = "refs/heads/master" ]; then
-            version=$(python3 -c "import sys; version=None; [version:=line.split('=')[1].strip().strip('\"') for line in open('src/pyproject.toml', 'r') if line.strip().startswith('version =')]; print(version if version else sys.exit(1))")
+            version=$(python3 -c "import sys; version=None; [version:=line.split('=')[1].strip().strip('\"') for line in open('pyproject.toml', 'r') if line.strip().startswith('version =')]; print(version if version else sys.exit(1))")
             tagged_image=${{ vars.DOCKERHUB_ORGANIZATION }}/hope:core-$version
             build_command="$build_command -t $tagged_image"
           fi
@@ -272,7 +272,7 @@ jobs:
         continue-on-error: true
         with:
           name: report
-          path: ./tests/report/
+          path: ./tests/selenium/output_data/report/
           retention-days: 5
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4

development_tools/.env.example

@@ -29,7 +29,11 @@ DATAMART_URL=https://datamart.unicef.io
 EXCHANGE_RATES_API_KEY=
 ADMIN_PANEL_URL=unicorn
 ROOT_ACCESS_TOKEN=test
-CELERY_BROKER_URL="redis://redis:6379/0"
+CELERY_BROKER_URL=redis://redis:6379/0
+CELERY_RESULT_BACKEND=redis://redis:6379/0
+CONSTANCE_REDIS_CONNECTION=redis://redis:6379/0
+CACHE_LOCATION=redis://redis:6379/1
+
 PROFILING=off
 USE_DUMMY_EXCHANGE_RATES=no
 OPENAPI_URL=127.0.0.1:8080/api/rest/

development_tools/compose.yml

@@ -16,7 +16,6 @@ services:
     env_file:
       - .env
     environment:
-      - REDIS_INSTANCE=redis:6379
       - PYTHONUNBUFFERED=1
     build:
       context: ..
@@ -61,8 +60,6 @@ services:
     image: unicef/hct-mis-backend
     env_file:
       - .env
-    environment:
-      - REDIS_INSTANCE=redis:6379
     volumes:
       - ../src:/code/
       - backend-data:/data
@@ -90,8 +87,6 @@ services:
     image: unicef/hct-mis-backend
     env_file:
       - .env
-    environment:
-      - REDIS_INSTANCE=redis:6379
     volumes:
       - ../src:/code/
       - backend-data:/data
@@ -186,9 +181,6 @@ services:
     ports:
       - "5555:5555"
     environment:
-      - REDIS_INSTANCE=redis:6379
-      - CELERY_BROKER_URL=redis://redis:6379/0
-      - CELERY_RESULT_BACKEND=redis://redis:6379/0
       - PYTHONUNBUFFERED=1
     depends_on:
       - celery-worker

development_tools/local_selenium_init.sh

@@ -27,13 +27,12 @@ export KOBO_KF_URL=https://kobo.humanitarianresponse.info
 export KOBO_KC_URL=https://kobo.humanitarianresponse.info
 export ADMIN_PANEL_URL=unicorn
 export PROFILING=off
-export CYPRESS_TESTING=yes
 export DJANGO_ALLOWED_HOST=localhost
 export HCT_MIS_FRONTEND_HOST=localhost:8080
-export REDIS_INSTANCE=localhost:6379
 export PYTHONUNBUFFERED=1
 export CELERY_BROKER_URL=redis://localhost:6379/0
 export CELERY_RESULT_BACKEND=redis://localhost:6379/0
+export CONSTANCE_REDIS_CONNECTION=redis://localhost:6379/0
 export CACHE_LOCATION=redis://localhost:6379/1
 export USE_DUMMY_EXCHANGE_RATES=yes
 export ELASTICSEARCH_HOST=http://localhost:9200

docker/Dockerfile

@@ -9,7 +9,7 @@ FROM curl as certs
 RUN curl -o /data/psql-cert.crt -L https://dl.cacerts.digicert.com/DigiCertGlobalRootCA.crt.pem
 
 # Base image
-FROM python:3.11.7-slim-bookworm as base
+FROM python:3.12.7-slim-bookworm as base
 
 ARG UID=82
 
@@ -42,7 +42,7 @@ RUN apt-get update \
 ENV PDM_PACKAGES=/packages
 ENV CODE=/code
 ENV PDM_PROJECT=$PDM_PACKAGES
-ENV PYPACKAGES=$PDM_PACKAGES/__pypackages__/3.11
+ENV PYPACKAGES=$PDM_PACKAGES/__pypackages__/3.12
 ENV PYTHONPYCACHEPREFIX=/tmp/pycache \
     PYTHONPATH=$PYPACKAGES/lib:$PYTHONPATH \
     PATH=$PYPACKAGES/bin:$PATH \
@@ -55,7 +55,8 @@ COPY --from=waitforit /data/waitforit /usr/local/bin/waitforit
 # Dist builder image
 FROM base as pdm
 RUN pip install --upgrade pip &&\
-    pip install pdm==2.15.2 &&\
+    pip install pdm==2.19.2 &&\
+    pip install pdm-backend &&\
     pip install setuptools==71.1.0 &&\
     pdm config cache_dir /var/cache/pdm &&\
     pdm config python.use_venv false &&\