try again

Author: timgraham

.github/workflows/django_settings.py

@@ -0,0 +1,37 @@
+# Settings for django/tests.
+import os
+
+from pymongo.uri_parser import parse_uri
+
+if mongodb_uri := os.getenv("MONGODB_URI"):
+    db_settings = {
+        "ENGINE": "django_mongodb_backend",
+        "HOST": mongodb_uri,
+    }
+    # Workaround for https://github.com/mongodb-labs/mongo-orchestration/issues/268
+    uri = parse_uri(mongodb_uri)
+    if uri.get("username") and uri.get("password"):
+        db_settings["OPTIONS"] = {"tls": True, "tlsAllowInvalidCertificates": True}
+    DATABASES = {
+        "default": {**db_settings, "NAME": "djangotests"},
+        "other": {**db_settings, "NAME": "djangotests-other"},
+    }
+else:
+    DATABASES = {
+        "default": {
+            "ENGINE": "django_mongodb_backend",
+            "NAME": "djangotests",
+            # Required when connecting to the Atlas image in Docker.
+            "OPTIONS": {"directConnection": True},
+        },
+        "other": {
+            "ENGINE": "django_mongodb_backend",
+            "NAME": "djangotests-other",
+            "OPTIONS": {"directConnection": True},
+        },
+    }
+
+DEFAULT_AUTO_FIELD = "django_mongodb_backend.fields.ObjectIdAutoField"
+PASSWORD_HASHERS = ("django.contrib.auth.hashers.MD5PasswordHasher",)
+SECRET_KEY = "django_tests_secret_key"  # noqa: S105
+USE_TZ = False

.github/workflows/encrypted_settings.py

@@ -1,3 +1,4 @@
+# Settings for django_mongodb_backend/tests when encryption is supported.
 import os
 
 from mongodb_settings import *  # noqa: F403

.github/workflows/mongodb_settings.py

@@ -1,36 +1,4 @@
-import os
+# Settings for django_mongodb_backend/tests when encryption isn't supported.
+from django_settings import *  # noqa: F403
 
-from pymongo.uri_parser import parse_uri
-
-if mongodb_uri := os.getenv("MONGODB_URI"):
-    db_settings = {
-        "ENGINE": "django_mongodb_backend",
-        "HOST": mongodb_uri,
-    }
-    # Workaround for https://github.com/mongodb-labs/mongo-orchestration/issues/268
-    uri = parse_uri(mongodb_uri)
-    if uri.get("username") and uri.get("password"):
-        db_settings["OPTIONS"] = {"tls": True, "tlsAllowInvalidCertificates": True}
-    DATABASES = {
-        "default": {**db_settings, "NAME": "djangotests"},
-        "other": {**db_settings, "NAME": "djangotests-other"},
-    }
-else:
-    DATABASES = {
-        "default": {
-            "ENGINE": "django_mongodb_backend",
-            "NAME": "djangotests",
-            # Required when connecting to the Atlas image in Docker.
-            "OPTIONS": {"directConnection": True},
-        },
-        "other": {
-            "ENGINE": "django_mongodb_backend",
-            "NAME": "djangotests-other",
-            "OPTIONS": {"directConnection": True},
-        },
-    }
-
-DEFAULT_AUTO_FIELD = "django_mongodb_backend.fields.ObjectIdAutoField"
-PASSWORD_HASHERS = ("django.contrib.auth.hashers.MD5PasswordHasher",)
-SECRET_KEY = "django_tests_secret_key"
-USE_TZ = False
+DATABASES["encrypted"] = {}  # noqa: F405

.github/workflows/runtests.py

@@ -180,7 +180,7 @@
     settings_module = (
         os.environ.get("DJANGO_SETTINGS_MODULE", "mongodb_settings")
         if app_name.endswith("_")
-        else "mongodb_settings"
+        else "django_settings"
     )
     res = os.system(run_tests_cmd % (app_name, settings_module))  # noqa: S605
     if res != 0:

pyproject.toml

@@ -104,11 +104,6 @@ unfixable = []
 exclude = []
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|dummy.*)$"
 
-[tool.ruff.lint.per-file-ignores]
-".github/workflows/mongodb_settings.py" = [
-    "S105",  # Possible hardcoded password assigned to: "SECRET_KEY"
-]
-
 [tool.coverage.report]
 exclude_lines = [
     "if (.*and +)*_use_c( and.*)*:",