chore(release): merge develop into main for the next release

.github/dependabot.yml

@@ -4,6 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "develop"
     labels:
       - "dependencies"
       - "ci"
@@ -12,5 +13,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "develop"
+    open-pull-requests-limit: 10
     labels:
       - "dependencies"

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   pull_request:
-    branches: [main, 1.0-maintenance, 2.0-development]
+    branches: [main, develop]
   push:
-    branches: [main]
+    branches: [main, develop]
 
 permissions:
   contents: read

.github/workflows/commitlint.yml

@@ -2,7 +2,7 @@ name: Commit Lint
 
 on:
   pull_request:
-    branches: [main, 1.0-maintenance]
+    branches: [main, develop]
 
 permissions:
   contents: read
@@ -30,9 +30,8 @@ jobs:
                 "chore", "docs", "test", "style", "ci", "perf"
               ]],
               "scope-enum": [1, "always", [
-                "core", "helpers", "deps", "release", "ci", 
-                "version", "hmac", "docs", "tests", "examples", 
-                "async", "statcalc"
+                "core", "helpers", "deps", "release", "ci",
+                "version", "hmac", "docs", "tests", "examples"
               ]],
               "subject-max-length": [1, "always", 100],
               "header-max-length": [0, "always"],

.github/workflows/integration.yml

@@ -2,9 +2,9 @@ name: Integration Tests
 
 on:
   pull_request:
-    branches: [main, 1.0-maintenance]
+    branches: [main, develop]
   push:
-    branches: [main]
+    branches: [main, develop]
   workflow_dispatch:
 
 permissions:

.github/workflows/release.yml

@@ -7,6 +7,7 @@ jobs:
   release:
     name: Semantic Release
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
 
     concurrency:
       group: ${{ github.workflow }}-release-${{ github.ref_name }}
@@ -70,6 +71,7 @@ jobs:
   # Publish the package to PyPI
   pypi-publish:
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
     needs:
       - release
     permissions:

src/swgoh_comlink/helpers/_arena.py

@@ -52,6 +52,7 @@ def get_arena_payout(offset: int, fleet: bool = False) -> datetime:
     else:
         payout = payout.replace(hour=18, minute=0, second=0, microsecond=0)
     payout = payout - timedelta(minutes=(offset + local_offset))
-    if payout < datetime.now():
+    # Loop until payout time is in the future in case payout time is adjusted to a past time
+    while payout < datetime.now():
         payout = payout + timedelta(days=1)
     return payout

tests/integration/test_hmac.py

@@ -14,6 +14,7 @@
     COMLINK_HMAC_URL,
     HMAC_ACCESS_KEY,
     HMAC_SECRET_KEY,
+    TEST_ALLYCODE,
 )
 
 pytestmark = pytest.mark.integration
@@ -48,14 +49,24 @@ def test_hmac_sync_player_request_succeeds(comlink_hmac):
 
 @hmac_configured
 def test_hmac_no_key_rejected():
-    """Sync client without HMAC keys is rejected by the protected endpoint."""
+    """Sync client without HMAC keys is rejected by the protected endpoint.
+
+    Uses a POST endpoint (`playerArena`) because the Comlink HMAC service
+    only enforces HMAC on POST; GET endpoints like `/enums` are
+    unauthenticated.
+    """
     with SwgohComlink(url=COMLINK_HMAC_URL) as client, pytest.raises(SwgohComlinkException):
-        client.get_enums()
+        client.get_player_arena(allycode=TEST_ALLYCODE, player_details_only=True)
 
 
 @hmac_configured
 def test_hmac_wrong_key_rejected():
-    """Sync client with wrong secret key is rejected by the protected endpoint."""
+    """Sync client with wrong secret key is rejected by the protected endpoint.
+
+    Uses a POST endpoint (`playerArena`) because the Comlink HMAC service
+    only enforces HMAC on POST; GET endpoints like `/enums` are
+    unauthenticated.
+    """
     with (
         SwgohComlink(
             url=COMLINK_HMAC_URL,
@@ -64,7 +75,7 @@ def test_hmac_wrong_key_rejected():
         ) as client,
         pytest.raises(SwgohComlinkException),
     ):
-        client.get_enums()
+        client.get_player_arena(allycode=TEST_ALLYCODE, player_details_only=True)
 
 
 # ── Async: valid HMAC ───────────────────────────────────────────────────
@@ -94,23 +105,33 @@ async def test_hmac_async_player_request_succeeds(async_comlink_hmac):
 @hmac_configured
 @pytest.mark.asyncio
 async def test_hmac_no_key_async_rejected():
-    """Async client without HMAC keys is rejected by the protected endpoint."""
+    """Async client without HMAC keys is rejected by the protected endpoint.
+
+    Uses a POST endpoint (`playerArena`) because the Comlink HMAC service
+    only enforces HMAC on POST; GET endpoints like `/enums` are
+    unauthenticated.
+    """
     async with SwgohComlinkAsync(url=COMLINK_HMAC_URL) as client:
         with pytest.raises(SwgohComlinkException):
-            await client.get_enums()
+            await client.get_player_arena(allycode=TEST_ALLYCODE, player_details_only=True)
 
 
 @hmac_configured
 @pytest.mark.asyncio
 async def test_hmac_wrong_key_async_rejected():
-    """Async client with wrong secret key is rejected by the protected endpoint."""
+    """Async client with wrong secret key is rejected by the protected endpoint.
+
+    Uses a POST endpoint (`playerArena`) because the Comlink HMAC service
+    only enforces HMAC on POST; GET endpoints like `/enums` are
+    unauthenticated.
+    """
     async with SwgohComlinkAsync(
         url=COMLINK_HMAC_URL,
         access_key=HMAC_ACCESS_KEY,
         secret_key="wrong_secret_key",
     ) as client:
         with pytest.raises(SwgohComlinkException):
-            await client.get_enums()
+            await client.get_player_arena(allycode=TEST_ALLYCODE, player_details_only=True)
 
 
 # ── HMAC header verification ────────────────────────────────────────────