Makefile

@@ -2,49 +2,49 @@ all: css migrate
 
 initialize: npm css migrate sethookdir loadplatforms
 
-HTMLFILES := $(shell find src/timetracker/games/templates -type f)
+HTMLFILES := $(shell find timetracker/games/templates -type f)
 
 npm:
 	npm install
 
-css: src/input.css
-	npx tailwindcss -i ./src/input.css -o  ./src/timetracker/games/static/base.css
+css: input.css
+	npx tailwindcss -i ./input.css -o  ./timetracker/games/static/base.css
 
 css-dev: css
-	npx tailwindcss -i ./src/input.css -o  ./src/timetracker/games/static/base.css --watch
+	npx tailwindcss -i ./input.css -o  ./timetracker/games/static/base.css --watch
 
 makemigrations:
-	poetry run python src/timetracker/manage.py makemigrations
+	poetry run python timetracker/manage.py makemigrations
 
 migrate: makemigrations
-	poetry run python src/timetracker/manage.py migrate
+	poetry run python timetracker/manage.py migrate
 
 dev: migrate
-	poetry run python src/timetracker/manage.py runserver
+	poetry run python timetracker/manage.py runserver
 
 caddy:
 	caddy run --watch
 
 dev-prod: migrate collectstatic
-	cd src/timetracker/; PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 root.asgi:application -k uvicorn.workers.UvicornWorker
+	cd timetracker/; PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 root.asgi:application -k uvicorn.workers.UvicornWorker
 
 dumpgames:
-	poetry run python src/timetracker/manage.py dumpdata --format yaml games --output tracker_fixture.yaml
+	poetry run python timetracker/manage.py dumpdata --format yaml games --output tracker_fixture.yaml
 
 loadplatforms:
-	poetry run python src/timetracker/manage.py loaddata platforms.yaml
+	poetry run python timetracker/manage.py loaddata platforms.yaml
 
 loadsample:
-	poetry run python src/timetracker/manage.py loaddata sample.yaml
+	poetry run python timetracker/manage.py loaddata sample.yaml
 
 createsuperuser:
-	poetry run python src/timetracker/manage.py createsuperuser
+	poetry run python timetracker/manage.py createsuperuser
 
 shell:
-	poetry run python src/timetracker/manage.py shell
+	poetry run python timetracker/manage.py shell
 
 collectstatic:
-	poetry run python src/timetracker/manage.py collectstatic --clear --no-input
+	poetry run python timetracker/manage.py collectstatic --clear --no-input
 
 poetry.lock: pyproject.toml
 	poetry install
@@ -56,6 +56,6 @@ date:
 	poetry run python -c 'import datetime; from zoneinfo import ZoneInfo; print(datetime.datetime.isoformat(datetime.datetime.now(ZoneInfo("Europe/Prague")), timespec="minutes", sep=" "))'
 
 cleanstatic:
-	rm -r src/timetracker/static/*
+	rm -r timetracker/static/*
 
 clean: cleanstatic

pyproject.toml

@@ -5,7 +5,7 @@ description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"
 readme = "README.md"
-packages = [{include = "timetracker", from = "src"}]
+packages = [{include = "timetracker"}]
 
 [tool.poetry.dependencies]
 python = "^3.10"
@@ -30,10 +30,5 @@ isort = "^5.11.4"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.pytest.ini_options]
-pythonpath = [
-  "src"
-]
-
 [tool.poetry.scripts]
-timetracker-import = "timetracker.common.util.import_data:import_from_file"
+timetracker-import = "timetracker.common.import_data:import_from_file"

timetracker/settings.py

@@ -14,7 +14,7 @@ import os
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_DIR = Path(__file__).resolve()
 
 
 # Quick-start development settings - unsuitable for production