x

tests/.env.example → .env.example

@@ -1,7 +1,7 @@
 # MAIN SETTINGS FOR THE DOCKER COMPOSE STACK
 
 # Change which dockerfiles to include. In production, make sure to only include docker-compose.yml
-COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
+COMPOSE_FILE=tests/docker-compose.yml:tests/docker-compose.dev.yml
 
 # Change this to the host name on which the stack is installed
 OGCAPIF_HOST=0.0.0.0

.github/workflows/benchmark.yml

@@ -23,9 +23,6 @@ on:
 jobs:
  benchmark:
  runs-on: ubuntu-latest
- defaults:
- run:
- working-directory: tests
  env:
  DOCKER_BUILDKIT: 1
  COMPOSE_DOCKER_CLI_BUILD: 1
@@ -54,18 +51,18 @@ jobs:
  uses: docker/setup-buildx-action@v3
 
  - name: Download fixtures
- run: ../scripts/download-fixtures.sh
+ run: scripts/download-fixtures.sh
 
  - name: Start Django
  run: |
  docker compose up --build -d
  docker compose exec django python manage.py migrate
 
  - name: Run Benchmark
- run: ./benchmark/time.sh ${{ inputs.size }}
+ run: .tests/benchmark/time.sh ${{ inputs.size }}
 
  - name: Create plots
- run: ./benchmark/plot.py
+ run: .tests/benchmark/plot.py
 
  - uses: actions/upload-artifact@v4
  with:

.github/workflows/conformance.yml

@@ -11,9 +11,6 @@ on:
 jobs:
  conformance:
  runs-on: ubuntu-latest
- defaults:
- run:
- working-directory: tests
  env:
  DOCKER_BUILDKIT: 1
  COMPOSE_DOCKER_CLI_BUILD: 1

.github/workflows/test.yml

@@ -25,9 +25,6 @@ jobs:
  steps:
  - uses: actions/checkout@v4
 
- - name: Create env
- run: cp .env.example .env
-
  - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v3
 

.gitignore

@@ -4,7 +4,7 @@ db.sqlite3
 .DS_Store
 *.pyc
 __pycache__
-tests/.env
+.env
 *.orig
 build
 dist

tests/docker-compose.dev.yml

@@ -7,15 +7,15 @@ services:
 
  caddy:
  volumes:
- - ./docker/caddy:/etc/caddy
+ - ./tests/docker/caddy:/etc/caddy
 
  django:
  environment:
  # live-reload, show exceptions in browser, etc.
  DJANGO_DEBUG: "true"
  volumes:
  # mounting the source code for live reloading
- - ./..:/usr/src
+ - ..:/usr/src
  # mounting directory to hold unit tests outputs
  - ./unit_tests_outputs/:/unit_tests_outputs
  ports:

tests/docker-compose.yml

@@ -6,7 +6,7 @@ services:
 
  caddy:
  build:
- context: docker/caddy
+ context: ./docker/caddy
  volumes:
  - caddy_data:/data
  - static_volume:/static_volume
@@ -22,7 +22,7 @@ services:
  image: opengisch/django-oapif:latest
  build:
  context: ..
- dockerfile: tests/docker/django/Dockerfile
+ dockerfile: ./tests/docker/django/Dockerfile
  cache_from:
  - opengisch/django-oapif:latest
  restart: unless-stopped

tests/docker/django/Dockerfile

@@ -13,6 +13,12 @@ RUN apt-get update && \
  gettext \
  graphviz
 
+COPY requirements-dev.txt .
+COPY requirements.txt .
+
+RUN pip install -r requirements-dev.txt
+RUN pip install -r requirements.txt
+
 COPY . /usr/src/
 
 RUN pip install /usr/src/.[dev]