diff --git a/environment.yml b/environment.yml index a335a62f..f18a909b 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,6 @@ dependencies: - click - tabulate - tqdm - - python-dotenv - coloredlogs - xarray - netcdf4 diff --git a/sfy-processing/.env-example b/sfy-processing/.env-example deleted file mode 100644 index 614b8d41..00000000 --- a/sfy-processing/.env-example +++ /dev/null @@ -1,3 +0,0 @@ -SFY_SERVER="https://wavebug.met.no" -SFY_READ_TOKEN="secret" -SFY_DATA_CACHE="/tmp/sfy-cache" diff --git a/sfy-processing/README.md b/sfy-processing/README.md index 6b49955b..3d955e7a 100644 --- a/sfy-processing/README.md +++ b/sfy-processing/README.md @@ -12,15 +12,7 @@ $ pip install -e . ## Usage -Specify the server and read-token in a [`.env`](./.env-example) file: - -``` -SFY_SERVER="http://wavebug.met.no:3000/" -SFY_READ_TOKEN="secret" -SFY_DATA_CACHE="/tmp/sfy-cache" -``` - -Or set them as environment variables in e.g. `.bashrc`: +Specify the server and read-token in environment variables, e.g. in `.bashrc`: ``` export SFY_SERVER='http://wavebug.met.no:3000' diff --git a/sfy-processing/sfy/hub.py b/sfy-processing/sfy/hub.py index 719d3b34..3be5d490 100644 --- a/sfy-processing/sfy/hub.py +++ b/sfy-processing/sfy/hub.py @@ -57,9 +57,6 @@ def __init__(self, endpoint, key, cache=None): @staticmethod def from_env(): from urllib.parse import urljoin - from dotenv import load_dotenv - - load_dotenv() API = os.getenv('SFY_SERVER') KEY = os.getenv('SFY_READ_TOKEN') diff --git a/sfy-processing/tests/__init__.py b/sfy-processing/tests/__init__.py index baa09f88..e320c696 100644 --- a/sfy-processing/tests/__init__.py +++ b/sfy-processing/tests/__init__.py @@ -1,22 +1,17 @@ import pytest import os -from dotenv import load_dotenv from sfy import hub def has_hub(): - load_dotenv() - API = os.getenv('SFY_SERVER') KEY = os.getenv('SFY_READ_TOKEN') - print(API, KEY) - if API is None or KEY is None: return False return True -needs_hub = pytest.mark.skipif(not has_hub(), reason="A data hub must be configured.") +needs_hub = pytest.mark.skipif(not has_hub(), reason="No data hub must configured.") @pytest.fixture def sfyhub(tmpdir):