From 0db57cff7791bca64959af9e530ad4c5cfb1f2be Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 20 Oct 2020 11:10:50 -0700 Subject: settings/make: default dynaconf environment name Also override any .env value for dynaconf env when running tests or lint. --- Makefile | 6 +++--- settings.toml | 2 +- 2 files changed, 4 insertions(+), 4 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 diff --git a/settings.toml b/settings.toml index 9a9db7c..c5845cf 100644 --- a/settings.toml +++ b/settings.toml @@ -18,7 +18,7 @@ INDEX_WORKER_BATCH_SIZE = 50 SCHOLAR_ENV = "test" FATCAT_API_HOST = "http://localhost:9411/v0" -[dev] +[development] SCHOLAR_ENV = "dev" ELASTICSEARCH_FULLTEXT_INDEX = "dev_scholar_fulltext" ELASTICSEARCH_BACKEND = "http://localhost:9200" -- cgit v1.2.3