Promote dev → uat: CI/typecheck fixes + dispose_engine regression test (CAR-1012/CAR-1330) #55

Merged

Coupon Carl merged 12 commits from dev into uat 2026-06-23 12:52:14 +00:00

Conversation 0 Commits 12 Files Changed 7

+27 -18

Coupon Carl commented 2026-06-23 12:40:00 +00:00

Owner

Copy Link

Copy Source

Summary

Promotes 11 commits from dev → uat, all CI/quality fixes:

• fix(ci): resolve dev lint + typecheck failures (CAR-1330)
• fix(ci): simplify Push step, remove GHA cache (CAR-1357/CAR-1362)
• fix(ci): REGISTRY_TOKEN for build-and-push (CAR-1330)
• fix(api): mypy no-redef + ruff format (CAR-1335)
• fix(api): dispose_engine lazy import regression test (CAR-1135)

No functional changes. CI passes on dev.

cc @cs_savannah @cpfarhood

## Summary Promotes 11 commits from dev → uat, all CI/quality fixes: - fix(ci): resolve dev lint + typecheck failures (CAR-1330) - fix(ci): simplify Push step, remove GHA cache (CAR-1357/CAR-1362) - fix(ci): REGISTRY_TOKEN for build-and-push (CAR-1330) - fix(api): mypy no-redef + ruff format (CAR-1335) - fix(api): dispose_engine lazy import regression test (CAR-1135) No functional changes. CI passes on dev. cc @cs_savannah @cpfarhood

Coupon Carl added 11 commits 2026-06-23 12:40:00 +00:00

fix(api): document dispose_engine lazy import + regression test (CAR-1135) ... 9e46bdc460

- main.py: add docstring inside the lifespan function explaining why
  dispose_engine is lazy-imported rather than top-level. The original
  import path (top-level) crashed the container at import time with
  'ImportError: cannot import name dispose_engine from cartsnitch_api.database'
  when database.py was stale or stripped during a CI build. Lazy import
  keeps the engine disposal behavior while preventing the module-load
  crash.
- tests/test_openapi.py: add test_dispose_engine_importable_from_database
  that asserts dispose_engine is importable and callable. This is the
  exact path the deployed UAT image was failing on, captured as a
  regression test so a future regression lands in CI before deploy.

Refs CAR-1135.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

style: ruff format conformance (CAR-1335) ... 4877513bbf

- tests/test_openapi.py: collapse 2 blank lines to 1 (ruff format)
- tests/conftest.py: collapse 2 blank lines to 1 (ruff format)

These format nits block lint (a hard gate). The conftest.py one was
introduced in CAR-1132 (#42) and would have blocked every subsequent PR
on dev until fixed.

Refs CAR-1335, CAR-1135.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

fix(api): mypy no-redef and no-any-return errors on dev (CAR-1335) ... 7b595744e1

The api typecheck job is continue-on-error but still posts a failure
status that blocks merges. Three pre-existing mypy errors on dev were
inherited by every PR based on it:

1. middleware/rate_limit.py: duplicate 'name already defined' for
   _public_limiter, _auth_limiter, _auth_strict_limiter (declared at
   lines 111-113 and again at 124-126). The second set is redundant
   because actual assignment happens inside the if/else below.
2. cache.py:43 - 'Returning Any' from .get(); the redis client's get()
   return type isn't narrowed to bytes|str, so the final 'return value'
   branch is Any. Wrap with str() to satisfy the declared str|None.
3. middleware/rate_limit.py:150 - 'Returning Any' from _get_client_ip.
   request.headers.get() and request.client.host are typed Any; wrap
   the branches with str() to match the declared str return.

Refs CAR-1335.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

fix(ci): resolve dev lint + typecheck failures (CAR-1330) ... 8deaf6e599

Three CI-blocking issues on dev branch (also present on uat, fixed in 2b20946):

1. tests/conftest.py — remove extra blank line (ruff format).
2. src/cartsnitch_api/middleware/rate_limit.py — delete duplicate
   _public_limiter/_auth_limiter/_auth_strict_limiter forward-decl block
   (the second occurrence; mypy no-redef).
3. src/cartsnitch_api/cache.py:38 — annotate
   value: str | bytes | None so mypy doesn't widen redis client return
   to Any (no-any-return).

Verified: ruff check . && ruff format --check . && mypy src/cartsnitch_api
all pass.

Sibling of CAR-1330 (which fixes uat directly). Heals dev so future
dev → uat promotions stay green.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

fix(ci): use REGISTRY_TOKEN for build-and-push registry login (CAR-1330) ... 79e8baa609

Squashed fix swaps github.token → secrets.REGISTRY_TOKEN at .gitea/workflows/ci.yml:121, matching the proven-green cartsnitch/auth pattern (CAR-1009). Parity fix with uat PR #49 to prevent reintroduction on next dev→uat promotion.

Note: includes 3 absorbed lint/typecheck commits from PR #48 (already merged to dev via #48) to unblock CI on this branch. No app code changes; one-line CI config swap only.

QA: PR #50 approved by @cs_charlie (review id 4616); CI run 3443 lint/typecheck/test all green.
Co-authored-by: Barcode Betty <32+cs_betty@noreply.git.farh.net>
Co-committed-by: Barcode Betty <32+cs_betty@noreply.git.farh.net>

fix(ci): remove GHA cache-from/cache-to (CAR-1357) ... 7a7d8f451e

The build-and-push job fails post-merge of CAR-1356 REGISTRY_TOKEN fix:
cache-from/cache-to: type=gha backend does not exist on Gitea. Build
succeeds but post-build cache export fails and cascades to skipping the
Push Docker image step. Confirmed in uat run 3444 + dev run 3445.

Per CAR-1362, drop cache-from and cache-to from both Build and Push
Docker image steps. Matches proven-green cartsnitch/auth/ci.yml pattern.

Refs: CAR-1362, CAR-1356, CAR-1330, CAR-1357.

Co-authored-by: Paperclip <noreply@paperclip.ing>

Merge pull request 'fix(ci): remove GHA cache-from/cache-to (CAR-1357)' (#52) from betty/car-1362-remove-gha-cache-dev into dev 30a447674d

fix(ci): simplify Push step to match auth pattern (CAR-1362) ... 354e26295c

The Push Docker image step is failing post-merge of CAR-1362 with
buildx "unknown" error after layers push successfully. The pre-existing
failure was masked by the cache export error.

Simplify the Push step to match the proven-green cartsnitch/auth/ci.yml
pattern: drop `file: ./Dockerfile` (default) and `build-args:`
(APT_CACHE_BUST is only used to bust apt cache in stage 1 of multi-
stage build, not needed for the rebuilt image). Keep `if: github.event_name
== "push"` to skip on pull_request events.

Diff: 4 lines removed from .gitea/workflows/ci.yml Push step.

Co-authored-by: Paperclip <noreply@paperclip.ing>

Merge pull request 'fix(ci): simplify Push step to match auth pattern (CAR-1362)' (#53) from betty/car-1362-push-unknown-fix into dev a3a01eefe2

Merge pull request 'fix(api): document dispose_engine lazy import + regression test (CAR-1135)' (#45) from barcode-betty/fix-car-1135-dispose-engine into dev b141377b02

Merge pull request 'fix(ci): resolve dev lint + typecheck failures (CAR-1330)' (#48) from betty/car-1330-dev-ci-fix into dev 135064fc10

Coupon Carl added 1 commit 2026-06-23 12:50:43 +00:00

fix(tests): use date.today() for seed ANCHOR_DATE to stay within 90-day trend window ... 7c14b33799

Hardcoded date(2026, 3, 15) fell outside the 90-day lookback on 2026-06-23,
causing test_public_trend_returns_data to see 0 data_points instead of >=2.

Savannah Savings approved these changes 2026-06-23 12:52:09 +00:00

Savannah Savings left a comment

Member

Copy Link

Copy Source

CI green after fixing stale ANCHOR_DATE. Approving for merge.

CI green after fixing stale ANCHOR_DATE. Approving for merge.

Coupon Carl merged commit 46e5d985ea into uat 2026-06-23 12:52:14 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Savannah Savings

Labels

Clear labels

bug

Something isn't working

documentation

Improvements or additions to documentation

duplicate

This issue or pull request already exists

enhancement

New feature or request

good first issue

Good for newcomers

help wanted

Extra attention is needed

invalid

This doesn't seem right

question

Further information is requested

wontfix

This will not be worked on

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ai-review (AI Review) cs_betty (Barcode Betty) cs_charlie (Checkout Charlie) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) cs_carl (Coupon Carl) cs_dottie (Deal Dottie) flux (Flux CD) admin (Gitea Admin) cs_martha (Markdown Martha) renovate (Mend Renovate) cs_savannah (Savannah Savings) cs_steve (Stockboy Steve)

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: cartsnitch/api#55