Skip to content

Commit

Permalink
Merge branch 'develop' into mellow-mvp
Browse files Browse the repository at this point in the history
  • Loading branch information
hweawer authored Jul 1, 2024
2 parents a788d53 + 8449fc7 commit 9649037
Show file tree
Hide file tree
Showing 6 changed files with 220 additions and 234 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.11
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- name: Setup poetry
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests-and-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.11
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- name: Setup poetry
run: |
Expand All @@ -28,17 +28,17 @@ jobs:
- name: Lint with Ruff
run: |
ruff --output-format=github .
poetry run ruff check --output-format=github .
continue-on-error: true

- name: Format with Ruff
run: |
ruff --output-format=github .
poetry run ruff check --output-format=github .
continue-on-error: true

- name: Typecheck with Pyright
run: |
pyright
poetry run pyright
continue-on-error: true

- name: Unit tests with pytest
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM python:3.11.9-slim as base
FROM python:3.12.4-slim as base

RUN apt-get update && apt-get install -y --no-install-recommends -qq \
gcc=4:12.2.0-3 \
libffi-dev=3.4.4-1 \
g++=4:12.2.0-3 \
curl=7.88.1-10+deb12u5 \
curl=7.88.1-10+deb12u6 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
Loading

0 comments on commit 9649037

Please sign in to comment.