From 1e69092c45c5f2401a1c3c5ec5dd6b640f768707 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 2 Jun 2024 21:29:54 -0400 Subject: [PATCH 1/2] Bump django. --- requirements.in/base.txt | 2 +- requirements.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/requirements.in/base.txt b/requirements.in/base.txt index 6410748..27d5d28 100644 --- a/requirements.in/base.txt +++ b/requirements.in/base.txt @@ -1,4 +1,4 @@ -django<4.0 +django>=4.0<5.0 msgpack pynacl fastapi diff --git a/requirements.txt b/requirements.txt index 7b51da4..62b6344 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --output-file=requirements.txt requirements.in/base.txt @@ -18,7 +18,7 @@ cffi==1.15.1 # via pynacl click==8.1.3 # via uvicorn -django==3.2.16 +django==4.1.13 # via -r requirements.in/base.txt fastapi==0.88.0 # via -r requirements.in/base.txt @@ -38,8 +38,6 @@ pynacl==1.5.0 # via -r requirements.in/base.txt python-dotenv==0.21.0 # via uvicorn -pytz==2022.6 - # via django pyyaml==6.0.1 # via uvicorn redis==4.4.0 From 23aedc8524e6b8c33837b8d789539b2f3ae76493 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 2 Jun 2024 21:30:04 -0400 Subject: [PATCH 2/2] Add linting to CI. --- .github/workflows/lint.yml | 32 ++++++++++++++++++++++++++++++++ scripts/lint.sh | 8 ++++++++ 2 files changed, 40 insertions(+) create mode 100644 .github/workflows/lint.yml create mode 100755 scripts/lint.sh diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..3d06008 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,32 @@ +name: API Lint +on: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-python@v2 + name: Install Python + with: + python-version: '3.8' + + - name: Pip cache + id: pip-cache + uses: actions/cache@v2 + with: + path: ${{ env.pythonLocation }} + key: api-lint-${{ runner.os }}-${{ env.pythonLocation }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements-dev.txt') }} + + - name: Install deps + if: steps.pip-cache.outputs.cache-hit != 'true' + run: | + python -m pip install --upgrade pip + python -m pip install -r requirements.txt + python -m pip install -r requirements-dev.txt + + - name: Run linting + run: | + sh ./scripts/lint.sh diff --git a/scripts/lint.sh b/scripts/lint.sh new file mode 100755 index 0000000..848eba3 --- /dev/null +++ b/scripts/lint.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -ex + +mypy . +npx -q pyright@1.1.172 . +ruff check . +ruff format --check .