Restructure Django apps

.github/workflows/docs.yml

@@ -6,41 +6,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     env:
-      DJANGO_SETTINGS_MODULE: 'backend.settings.test'
-      REDIS_PORT: 6379
-      REDIS_CONFIG_DB: 1
-      REDIS_CACHE_DB: 2
-      REDIS_HOST: localhost
-      SQL_PORT: 5432
-      SQL_USER: ractf
-      SQL_HOST: localhost
-      SQL_DATABASE: ractf
-      SQL_PASSWORD: postgres
-    services:
-      postgres:
-        image: postgres:12-alpine
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_EXTENSIONS: citext
-          POSTGRES_HOST_AUTH_METHOD: trust
-          POSTGRES_DB: ractf
-          POSTGRES_USER: ractf
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-      redis:
-        image: redis:5
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379
+      DJANGO_SETTINGS_MODULE: 'core.settings.lint'
 
     steps:
     - name: Checkout repository
@@ -89,11 +55,10 @@ jobs:
         PIP_CACHE_DIR: ~/.pip
 
     - name: Run Migrations
-      run: ./manage.py migrate
-      working-directory: ./src
+      run: make migrate
 
     - name: Generate OpenAPI schema
-      run: set -eo pipefail && ./src/manage.py getschema | tee openapi-schema.yml
+      run: set -eo pipefail && python src/manage.py getschema | tee openapi-schema.yml
 
     - name: Publish API documentation to GitHub
       uses: actions/upload-artifact@v2

.github/workflows/test.yml

@@ -5,8 +5,6 @@ on: push
 jobs:
   test:
     runs-on: ubuntu-latest
-    env:
-      DJANGO_SETTINGS_MODULE: 'backend.settings.lint'
 
     steps:
     - name: Checkout repository

Makefile

@@ -1,6 +1,7 @@
 .EXPORT_ALL_VARIABLES:
 BETTER_EXCEPTIONS=1
-DJANGO_SETTINGS_MODULE?=backend.settings.lint
+PYTHONPATH=$(shell pwd)/src
+DJANGO_SETTINGS_MODULE?=core.settings.lint
 
 migrate:
 	python src/manage.py migrate
@@ -9,33 +10,43 @@ migrations:
 	python src/manage.py makemigrations
 
 test: migrate
-	pytest --testmon src || \
+	pytest --testmon || \
 	if [ $$? = 5 ]; \
 	  then exit 0; \
 	  else exit $$?; \
 	fi
 
 coverage: migrate
-	pytest --cov=. --cov-report=xml src && \
+	pytest --cov=. --cov-report=xml && \
 	coverage html && \
-	which xdg-open && \
+	[ "$$CI" != "true" ] && \
 	xdg-open htmlcov/index.html || true
 
 format:
 	isort src && \
 	black src
 
-lint:
-	flake8 && \
+lint: migrate
+	flakehell lint src && \
 	isort --check-only src
 
 dev-server:
 	docker-compose build && \
 	docker-compose up -d
 
+dev-server-attach:
+	docker-compose build && \
+	docker-compose up
+
 dev-test: dev-server
 	docker-compose exec backend pytest --cov=src src
 
+dev-server-logs: dev-server
+	docker-compose logs -f
+
+dev-server-down:
+	docker-compose down
+
 fake-data:
 	python -m scripts.fake generate $(ARGS)
 

docker-compose.yml

@@ -37,7 +37,7 @@ services:
       - DOMAIN=localhost
       - FRONTEND_URL=http://localhost:8000/
       - SECRET_KEY=CorrectHorseBatteryStaple
-      - DJANGO_SETTINGS_MODULE=backend.settings.local
+      - DJANGO_SETTINGS_MODULE=core.settings.local
 
       - ANDROMEDA_IP=andromeda
       - ANDROMEDA_URL=http://andromeda:6000
@@ -58,7 +58,7 @@ services:
   sockets:
     <<: *backend
     entrypoint: /app/entrypoints/sockets.sh
-    command: gunicorn -w 12 -b 0.0.0.0:8000 -k uvicorn.workers.UvicornWorker backend.asgi:application
+    command: gunicorn -w 1 -b 0.0.0.0:8000 -k uvicorn.workers.UvicornWorker core.asgi:application --chdir src
     depends_on:
       - backend
     working_dir: /app/src/