From 25c25b92ce1d2927afe272a8690bbdd5e044f9f9 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 13 Dec 2023 08:29:35 +0100
Subject: [PATCH] Move source files to src

---
 .github/workflows/main.yml                           | 4 ++--
 Dockerfile                                           | 4 +++-
 search_geom_service.py => src/search_geom_service.py | 0
 search_service.py => src/search_service.py           | 0
 server.py => src/server.py                           | 0
 server.wsgi => src/server.wsgi                       | 0
 6 files changed, 5 insertions(+), 3 deletions(-)
 rename search_geom_service.py => src/search_geom_service.py (100%)
 rename search_service.py => src/search_service.py (100%)
 rename server.py => src/server.py (100%)
 rename server.wsgi => src/server.wsgi (100%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index da57c45..42078ae 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,13 +27,13 @@ jobs:
       - name: Setting up Python
         uses: actions/setup-python@v2
         with:
-            python-version: '3.10'
+            python-version: '3.12'
 
       - name: Run unittests
         run: |
           python -m pip install --upgrade pip
           python -m pip install -r requirements.txt
-          CONFIG_PATH=$PWD/qwc-docker/volumes/config/ python test.py
+          PYTHONPATH=$PWD/src CONFIG_PATH=$PWD/qwc-docker/volumes/config/ python test.py
 
     build:
       needs: test
diff --git a/Dockerfile b/Dockerfile
index ddcc84e..6218242 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM sourcepole/qwc-uwsgi-base:alpine-v2023.10.26
 
-ADD . /srv/qwc_service
+ADD requirements.txt /srv/qwc_service/requirements.txt
 
 # git: Required for pip with git repos
 # postgresql-dev g++ python3-dev: Required for psycopg2
@@ -13,4 +13,6 @@ RUN \
     pip3 install --no-cache-dir -r /srv/qwc_service/requirements.txt && \
     apk del build-deps
 
+ADD src /srv/qwc_service/
+
 ENV SERVICE_MOUNTPOINT=/api/v2/search
diff --git a/search_geom_service.py b/src/search_geom_service.py
similarity index 100%
rename from search_geom_service.py
rename to src/search_geom_service.py
diff --git a/search_service.py b/src/search_service.py
similarity index 100%
rename from search_service.py
rename to src/search_service.py
diff --git a/server.py b/src/server.py
similarity index 100%
rename from server.py
rename to src/server.py
diff --git a/server.wsgi b/src/server.wsgi
similarity index 100%
rename from server.wsgi
rename to src/server.wsgi