Skip to content

Commit c2d1734

Browse files
authored
Merge branch 'main' into sqlalchemy-min-version
2 parents 656b20c + 1b275bd commit c2d1734

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
id: cache
5252
with:
5353
path: ${{ env.pythonLocation }}
54-
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml', 'requirements-tests.txt') }}
54+
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml', 'requirements-tests.txt') }}-v01
5555
- name: Install Dependencies
5656
if: steps.cache.outputs.cache-hit != 'true'
5757
run: pip install -r requirements-tests.txt
@@ -60,7 +60,7 @@ jobs:
6060
run: pip install --upgrade "pydantic>=1.10.0,<2.0.0"
6161
- name: Install Pydantic v2
6262
if: matrix.pydantic-version == 'pydantic-v2'
63-
run: pip install --upgrade "pydantic>=2.0.2,<3.0.0"
63+
run: pip install --upgrade "pydantic>=2.0.2,<3.0.0" "typing-extensions==4.6.1"
6464
- name: Lint
6565
# Do not run on Python 3.7 as mypy behaves differently
6666
if: matrix.python-version != '3.7' && matrix.pydantic-version == 'pydantic-v2'

requirements-tests.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ httpx ==0.24.1
1010
# TODO: upgrade when deprecating Python 3.7
1111
dirty-equals ==0.6.0
1212
jinja2 ==3.1.3
13+
# Pin typing-extensions until Python 3.8 is deprecated or the issue with dirty-equals
14+
# is fixed, maybe fixed after dropping Python 3.7 and upgrading dirty-equals
15+
typing-extensions ==4.6.1

0 commit comments

Comments
 (0)