Move source files to src

qwc-services · Dec 13, 2023 · 25c25b9 · 25c25b9
1 parent c5124be
commit 25c25b9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 → src/search_geom_service.py b/search_geom_service.py → src/search_geom_service.py
diff --git a/search_service.py → src/search_service.py b/search_service.py → src/search_service.py
diff --git a/server.py → src/server.py b/server.py → src/server.py
diff --git a/server.wsgi → src/server.wsgi b/server.wsgi → src/server.wsgi