Merge pull request #166 from openstates/update-logs

Change recent commit check to 6 hours

Author: alexobaseki

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.21.2 - Mar 3, 2025
+
+* Catch Django Settings already configures exception
+
 ## 6.21.1 - Mar 1, 2025
 
 * Update people repo cli usage

openstates/cli/people_repo_update.py

@@ -28,12 +28,12 @@ def no_recent_people_repo_commit() -> bool:
         last_commit_time = datetime.datetime.fromisoformat(
             last_commit_time.rstrip("Z")
         ).replace(tzinfo=datetime.timezone.utc)
-        two_hours_ago = datetime.datetime.now(
+        six_hours_ago = datetime.datetime.now(
             datetime.timezone.utc
         ) - datetime.timedelta(
-            minutes=2 * 60 + 5
-        )  # 2 hours and 5-minute buffer.
-        no_recent_commit_exists = two_hours_ago > last_commit_time
+            minutes=6 * 60 + 5
+        )  # 6 hours and 5-minute buffer.
+        no_recent_commit_exists = six_hours_ago > last_commit_time
     return no_recent_commit_exists
 
 

openstates/utils/django.py

@@ -15,16 +15,20 @@ def init_django() -> None:  # pragma: no cover
     else:
         DATABASES["default"]["OPTIONS"]["application_name"] = application_name
 
-    conf.settings.configure(
-        conf.global_settings,
-        SECRET_KEY="not-important",
-        DEBUG=False,
-        INSTALLED_APPS=(
-            "django.contrib.contenttypes",
-            "openstates.data",
-        ),
-        DATABASES=DATABASES,
-        TIME_ZONE="UTC",
-        MIDDLEWARE_CLASSES=(),
-    )
-    django.setup()
+    try:
+        conf.settings.configure(
+            conf.global_settings,
+            SECRET_KEY="not-important",
+            DEBUG=False,
+            INSTALLED_APPS=(
+                "django.contrib.contenttypes",
+                "openstates.data",
+            ),
+            DATABASES=DATABASES,
+            TIME_ZONE="UTC",
+            MIDDLEWARE_CLASSES=(),
+        )
+        django.setup()
+    except RuntimeError as e:
+        if "Settings already configured." not in str(e):
+            raise RuntimeError(f"Encountered error {e}")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openstates"
-version = "6.21.1"
+version = "6.21.2"
 description = "core infrastructure for the openstates project"
 authors = ["James Turk <[email protected]>"]
 license = "MIT"