aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2020-10-20 11:10:50 -0700
committerBryan Newbold <bnewbold@archive.org>2020-10-20 11:10:53 -0700
commit0db57cff7791bca64959af9e530ad4c5cfb1f2be (patch)
tree044064457f147efe3ebeac6e63170c45266742e9 /Makefile
parentcdd0157f2e86086610b7c1a6288bda7d3fc7da7d (diff)
downloadfatcat-scholar-0db57cff7791bca64959af9e530ad4c5cfb1f2be.tar.gz
fatcat-scholar-0db57cff7791bca64959af9e530ad4c5cfb1f2be.zip
settings/make: default dynaconf environment name
Also override any .env value for dynaconf env when running tests or lint.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7733f5c..a5c16b4 100644
--- a/Makefile
+++ b/Makefile
@@ -25,15 +25,15 @@ fmt: ## Run code formating on all source code
.PHONY: test
test: lint ## Run all tests and lints
- ENV_FOR_DYNACONF=test pipenv run pytest
+ PIPENV_DONT_LOAD_ENV=1 ENV_FOR_DYNACONF=test pipenv run pytest
.PHONY: coverage
coverage: lint ## Run all tests with coverage
- ENV_FOR_DYNACONF=test pipenv run pytest --cov
+ PIPENV_DONT_LOAD_ENV=1 ENV_FOR_DYNACONF=test pipenv run pytest --cov
.PHONY: dev
dev: ## Run web service locally, with reloading
- ENV_FOR_DYNACONF=dev pipenv run uvicorn fatcat_scholar.web:app --reload --port 9819
+ ENV_FOR_DYNACONF=development pipenv run uvicorn fatcat_scholar.web:app --reload --port 9819
.PHONY: dev-qa
dev-qa: ## Run web service locally, with reloading, but point search queries to QA search index