Move more files to src

This commit is contained in:
Andreas Zweili 2022-11-27 18:06:17 +01:00
parent 2e5e0f793a
commit d1cd80950e
6 changed files with 5 additions and 8 deletions

View File

@ -4,5 +4,5 @@ exclude =
__init__.py, __init__.py,
*cache*, *cache*,
venv/, venv/,
manage.py, src/manage.py,
network_inventory/settings/* src/network_inventory/settings/*

View File

@ -7,7 +7,7 @@ run: setup
( \ ( \
find . -name __pycache__ -o -name "*.pyc" -delete; \ find . -name __pycache__ -o -name "*.pyc" -delete; \
sudo iptables -I INPUT -p tcp --dport 8000 -j ACCEPT; \ sudo iptables -I INPUT -p tcp --dport 8000 -j ACCEPT; \
cd src/ cd src/; \
python manage.py runserver 0.0.0.0:8000; \ python manage.py runserver 0.0.0.0:8000; \
) )
@ -15,7 +15,7 @@ run: setup
setup: setup:
( \ ( \
docker-compose -f docker-compose-development.yml up -d; \ docker-compose -f docker-compose-development.yml up -d; \
cd src/ cd src/; \
if [ -f .second_run ]; then \ if [ -f .second_run ]; then \
sleep 2; \ sleep 2; \
python manage.py collectstatic --noinput; \ python manage.py collectstatic --noinput; \
@ -72,7 +72,7 @@ init:
.PHONY: test .PHONY: test
test: test:
( \ ( \
pytest --ds=network_inventory.settings.ram_test -nauto --nomigrations --cov=. --cov-report=html; \ pytest --ds=network_inventory.settings.ram_test -nauto --nomigrations --cov=./src --cov-report=html ./src; \
) )
.PHONY: debug .PHONY: debug

View File

@ -16,9 +16,6 @@
(final: prev: { (final: prev: {
inventoryEnv = prev.poetry2nix.mkPoetryEnv { inventoryEnv = prev.poetry2nix.mkPoetryEnv {
projectDir = ./.; projectDir = ./.;
editablePackageSources = {
inventory = ./src;
};
}; };
inventoryPackage = prev.poetry2nix.mkPoetryApplication { inventoryPackage = prev.poetry2nix.mkPoetryApplication {
projectDir = ./.; projectDir = ./.;

0
manage.py → src/manage.py Executable file → Normal file
View File