From 44adc5b94d90089724996ad6946fd11e9c74aafc Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 1 Mar 2022 10:04:34 +0100 Subject: [PATCH] move the ENV variable to the nix-shell --- .envrc | 1 + Makefile | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.envrc b/.envrc index 3550a30..0d69151 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,2 @@ use flake +eval "$shellHook" diff --git a/Makefile b/Makefile index 98f648e..c20d813 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ SHELL=/usr/bin/env bash .PHONY: run run: setup ( \ - export DJANGO_SETTINGS_MODULE=network_inventory.settings.local; \ find . -name __pycache__ -o -name "*.pyc" -delete; \ python manage.py runserver; \ ) @@ -13,7 +12,6 @@ run: setup .PHONY: setup setup: ( \ - export DJANGO_SETTINGS_MODULE=network_inventory.settings.local; \ docker-compose -f docker-compose-development.yml up -d; \ if [ -f .second_run ]; then \ sleep 2; \ @@ -64,20 +62,17 @@ cleanall: clean .PHONY: init init: ( \ - export DJANGO_SETTINGS_MODULE=network_inventory.settings.local; \ python manage.py loaddata network_inventory.yaml; \ ) .PHONY: test test: ( \ - export DJANGO_SETTINGS_MODULE=network_inventory.settings.local; \ pytest -nauto --nomigrations --cov=. --cov-report=html; \ ) .PHONY: debug debug: ( \ - export DJANGO_SETTINGS_MODULE=network_inventory.settings.local; \ pytest --pdb --nomigrations --cov=. --cov-report=html; \ )