#3481_updated codeQL to use conda env and updated env folder structure.

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,7 @@ jobs:
         # By default, queries listed here will override any specified in a config file. 
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
-        languages: python 
+        languages: python
         setup-python-dependencies: false
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).

.gitignore

@@ -3,9 +3,11 @@
 vcf_reader
 *~
 data/*
-media_root/*
 /.settings/
+### Django ###
 __pycache__/
+media_root/*
+
 LabNameLocations.csv
 /jshintrc
 dump.rdb
@@ -19,3 +21,17 @@ lint.txt
 **/.sass-cache/
 /source_id_migration.log
 csv-editor.xml
+
+#ignore developers env settings
+/variantgrid/settings/env_developers/
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+cover/

config/settings_config.json

@@ -50,6 +50,12 @@
       "host": "https://variantgrid.com",
       "oauth_url": "",
       "client_id": "variantgrid-remote-client"
+    },
+    "AWS": {
+        "S3": {
+            "access_key_id": null,
+            "secret_access_key": null
+        }
     }
   }
 }

variantgrid/settings/__init__.py

@@ -28,13 +28,20 @@
         flattened_hostname = "s" + flattened_hostname
 
     pwd = os.path.dirname(__file__)
-    flattened_hostname_path = os.path.join(pwd, 'env', f"{flattened_hostname}.py")
-
-    logging.info('LOADING settings file %s', flattened_hostname_path)
-    if os.path.exists(flattened_hostname_path):
-        flattened_hostname_module = f"variantgrid.settings.env.{flattened_hostname}"
+    # Search for the environment file in the 'env_developers' folder first
+    flattened_hostname_path_override = os.path.join(pwd, 'env_developers', f"{flattened_hostname}.py")
+    if os.path.exists(flattened_hostname_path_override):
+        flattened_hostname_module = f"variantgrid.settings.env_developers.{flattened_hostname}"
         exec(f"from {flattened_hostname_module} import *")
     else:
-        logging.error("Settings file doesn't exist %s", flattened_hostname_path)
+        # If not found, use the environment file from the original 'env'
+        flattened_hostname_path = os.path.join(pwd, 'env', f"{flattened_hostname}.py")
+
+        logging.info('LOADING settings file %s', flattened_hostname_path)
+        if os.path.exists(flattened_hostname_path):
+            flattened_hostname_module = f"variantgrid.settings.env.{flattened_hostname}"
+            exec(f"from {flattened_hostname_module} import *")
+        else:
+            logging.error("Settings file doesn't exist %s", flattened_hostname_path)
 else:
     exec(f"from {django_settings_module} import *")