From 97529419196184707962e058f23d495f9b2824d0 Mon Sep 17 00:00:00 2001 From: Dreadless Date: Fri, 7 Aug 2026 15:51:28 +0600 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20unbreak=20CI=20=E2=80=94=20fix=20req?= =?UTF-8?q?uirements,=20redis=208=20reset(),=20clean=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 1 + .github/workflows/ci.yml | 14 -------------- .gitignore | 1 + app/storage.py | 2 +- requirements.txt | 39 +++++---------------------------------- 5 files changed, 8 insertions(+), 49 deletions(-) diff --git a/.dockerignore b/.dockerignore index 3c5a40e..0849b23 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,6 +14,7 @@ htmlcov # Virtual environments .venv +.venv-ci env/ venv/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 412cf2c..88449f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,17 +38,6 @@ jobs: test: runs-on: ubuntu-latest - services: - redis: - image: redis:7-alpine - ports: - - 6379:6379 - options: >- - --health-cmd "redis-cli ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - steps: - name: Checkout repository uses: actions/checkout@v4 @@ -63,11 +52,8 @@ jobs: run: | python -m pip install --upgrade pip if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Run tests with Pytest - env: - REDIS_URL: redis://localhost:6379 run: | pytest diff --git a/.gitignore b/.gitignore index 6aa3943..fc84ee9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ __pycache__/ *.py[cod] .venv/ +.venv-ci/ venv/ .env .pytest_cache/ diff --git a/app/storage.py b/app/storage.py index 722ec8b..a563fa5 100644 --- a/app/storage.py +++ b/app/storage.py @@ -44,4 +44,4 @@ async def read_secret(r: Redis, key: str) -> bytes | None: except redis_exceptions.WatchError: continue finally: - pipe.reset() + await pipe.reset() diff --git a/requirements.txt b/requirements.txt index c4854fb..05d715f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,5 @@ -annotated-doc==0.0.5 -annotated-types==0.8.0 -anyio==4.14.2 -certifi==2026.7.22 -cffi==2.1.1 -click==8.4.2 -cryptography==50.0.0 -fakeredis==2.37.0 -fastapi==0.141.1 -h11==0.16.0 -httpcore==1.0.9 -httptools==0.8.0 -httpx==0.28.1 -idna==3.18 -iniconfig==2.3.0 -packaging==26.3 -pluggy==1.6.0 -pycparser==3.0 -pydantic==2.13.4 -pydantic-settings==2.14.2 -pydantic_core==2.47.0 -pytest==9.1.1 -pytest-asyncio==1.4.0 -python-dotenv==1.2.2 -PyYAML==6.0.3 -redis==8.1.0 -sortedcontainers==2.4.0 -starlette==1.4.1 -typing-inspection==0.4.2 -typing_extensions==4.16.0 -uvicorn==0.52.1 -uvloop==0.22.1 -watchfiles==1.2.0 -websockets==17.0.1 +fastapi~=0.141.1 +uvicorn[standard]~=0.52.1 +pydantic-settings~=2.14.2 +redis~=8.1.0 +cryptography~=50.0.0 From 548d22ad6fc80d4907eaba9362d05077481c0aac Mon Sep 17 00:00:00 2001 From: Dreadless Date: Fri, 7 Aug 2026 15:53:33 +0600 Subject: [PATCH 2/2] ci: tune dependabot (direct deps only, group minor/patch) --- .github/dependabot.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 95b538f..e118041 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,4 +4,14 @@ updates: directory: "/" schedule: interval: "daily" - open-pull-requests-limit: 10 + open-pull-requests-limit: 5 + # Only track the direct deps listed in requirements.txt / + # requirements-dev.txt, not the whole transitive tree. + allow: + - dependency-type: "direct" + # Bundle minor/patch bumps into one PR to reduce noise. + groups: + minor-patch: + update-types: + - "minor" + - "patch"