updated import for environments.json

MAAP-Project · Dec 4, 2024 · 860dc6a · 860dc6a
1 parent 154e28e
commit 860dc6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/endpoints/environment.py b/api/endpoints/environment.py
@@ -7,6 +7,7 @@
 import requests
 import urllib.parse
 import json
+import os
 
 log = logging.getLogger(__name__)
 
@@ -61,7 +62,8 @@ def get(self, ade_host):
 def get_config(ade_host):
     print("graceal1 in API get_config with")
     print(ade_host)
-    with open("environments.json") as f:
+    ROOT = os.path.dirname(os.path.abspath(__file__))   
+    with open(os.path.join(ROOT, "environments.json")) as f:
         data = json.loads(f)
 
     base_url = "{0.netloc}".format(urlsplit(urllib.parse.unquote(ade_host)))

diff --git a/api/settings.py b/api/settings.py
@@ -43,8 +43,6 @@ def str2bool(v):
 GITLAB_TOKEN = os.getenv('GITLAB_TOKEN', 'foobar')
 GITLAB_API_TOKEN = os.getenv('GITLAB_API_TOKEN','')  # New setting inherited from sister, remove comment after API is stable
 
-MAAP_ENVIRONMENT_FILE = os.getenv('MAAP_ENVIRONMENT_FILE', 'https://raw.githubusercontent.com/MAAP-Project/maap-workspaces/refs/heads/main/jupyterlab/environments.json')
-
 REPO_NAME = os.getenv('REPO_NAME', 'register-job')
 REPO_PATH = os.getenv('REPO_PATH', '/home/ubuntu/repo')
 VERSION = os.getenv('VERSION', 'master')