Skip to content

Commit 7f362d8

Browse files
DaraanDaraan
authored
Merge branch 'main' into ParamSpec/Generic-simple
2 parents edf7d19 + b7d6353 commit 7f362d8

File tree

2 files changed

+53
-73
lines changed

2 files changed

+53
-73
lines changed

‎.github/workflows/third_party.yml‎

Lines changed: 52 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,27 @@ jobs:
4848
runs-on: ubuntu-latest
4949
timeout-minutes: 60
5050
steps:
51-
- name: Checkout pydantic
52-
uses: actions/checkout@v4
51+
- name: Setup Python
52+
uses: actions/setup-python@v5
5353
with:
54-
repository: pydantic/pydantic
55-
- name: Edit pydantic pyproject.toml
56-
# pydantic's python-requires means pdm won't let us add typing-extensions-latest
57-
# as a requirement unless we do this
58-
run: sed -i 's/^requires-python = .*/requires-python = ">=3.8"/' pyproject.toml
54+
python-version: ${{ matrix.python-version }}
55+
allow-prereleases: true
56+
- name: Install uv
57+
run: curl -LsSf https://astral.sh/uv/install.sh | sh
58+
- name: Checkout pydantic
59+
run: git clone --depth=1 https://github.com/pydantic/pydantic.git || git clone --depth=1 https://github.com/pydantic/pydantic.git
5960
- name: Checkout typing_extensions
6061
uses: actions/checkout@v4
6162
with:
6263
path: typing-extensions-latest
63-
- name: Setup pdm for pydantic tests
64-
uses: pdm-project/setup-pdm@v4
65-
with:
66-
python-version: ${{ matrix.python-version }}
67-
allow-python-prereleases: true
6864
- name: Add local version of typing_extensions as a dependency
69-
run: pdm add ./typing-extensions-latest
65+
run: cd pydantic; uv add --editable ../typing-extensions-latest
7066
- name: Install pydantic test dependencies
71-
run: pdm install -G testing -G email
67+
run: cd pydantic; uv sync --group dev
7268
- name: List installed dependencies
73-
run: pdm list -vv # pdm equivalent to `pip list`
69+
run: cd pydantic; uv pip list
7470
- name: Run pydantic tests
75-
run: pdm run pytest
71+
run: cd pydantic; uv run pytest
7672

7773
typing_inspect:
7874
name: typing_inspect tests
@@ -93,21 +89,18 @@ jobs:
9389
runs-on: ubuntu-latest
9490
timeout-minutes: 60
9591
steps:
96-
- name: Checkout typing_inspect
97-
uses: actions/checkout@v4
98-
with:
99-
repository: ilevkivskyi/typing_inspect
100-
path: typing_inspect
101-
- name: Checkout typing_extensions
102-
uses: actions/checkout@v4
103-
with:
104-
path: typing-extensions-latest
10592
- name: Setup Python
10693
uses: actions/setup-python@v5
10794
with:
10895
python-version: ${{ matrix.python-version }}
10996
- name: Install uv
11097
run: curl -LsSf https://astral.sh/uv/install.sh | sh
98+
- name: Checkout typing_inspect
99+
run: git clone --depth=1 https://github.com/ilevkivskyi/typing_inspect.git || git clone --depth=1 https://github.com/ilevkivskyi/typing_inspect.git
100+
- name: Checkout typing_extensions
101+
uses: actions/checkout@v4
102+
with:
103+
path: typing-extensions-latest
111104
- name: Install typing_inspect test dependencies
112105
run: |
113106
set -x
@@ -141,22 +134,19 @@ jobs:
141134
runs-on: ubuntu-latest
142135
timeout-minutes: 60
143136
steps:
144-
- name: Check out pyanalyze
145-
uses: actions/checkout@v4
146-
with:
147-
repository: quora/pyanalyze
148-
path: pyanalyze
149-
- name: Checkout typing_extensions
150-
uses: actions/checkout@v4
151-
with:
152-
path: typing-extensions-latest
153137
- name: Setup Python
154138
uses: actions/setup-python@v5
155139
with:
156140
python-version: ${{ matrix.python-version }}
157141
allow-prereleases: true
158142
- name: Install uv
159143
run: curl -LsSf https://astral.sh/uv/install.sh | sh
144+
- name: Check out pyanalyze
145+
run: git clone --depth=1 https://github.com/quora/pyanalyze.git || git clone --depth=1 https://github.com/quora/pyanalyze.git
146+
- name: Checkout typing_extensions
147+
uses: actions/checkout@v4
148+
with:
149+
path: typing-extensions-latest
160150
- name: Install pyanalyze test requirements
161151
run: |
162152
set -x
@@ -190,22 +180,19 @@ jobs:
190180
runs-on: ubuntu-latest
191181
timeout-minutes: 60
192182
steps:
193-
- name: Check out typeguard
194-
uses: actions/checkout@v4
195-
with:
196-
repository: agronholm/typeguard
197-
path: typeguard
198-
- name: Checkout typing_extensions
199-
uses: actions/checkout@v4
200-
with:
201-
path: typing-extensions-latest
202183
- name: Setup Python
203184
uses: actions/setup-python@v5
204185
with:
205186
python-version: ${{ matrix.python-version }}
206187
allow-prereleases: true
207188
- name: Install uv
208189
run: curl -LsSf https://astral.sh/uv/install.sh | sh
190+
- name: Check out typeguard
191+
run: git clone --depth=1 https://github.com/agronholm/typeguard.git || git clone --depth=1 https://github.com/agronholm/typeguard.git
192+
- name: Checkout typing_extensions
193+
uses: actions/checkout@v4
194+
with:
195+
path: typing-extensions-latest
209196
- name: Install typeguard test requirements
210197
run: |
211198
set -x
@@ -240,21 +227,18 @@ jobs:
240227
runs-on: ubuntu-latest
241228
timeout-minutes: 60
242229
steps:
243-
- name: Check out typed-argument-parser
244-
uses: actions/checkout@v4
245-
with:
246-
repository: swansonk14/typed-argument-parser
247-
path: typed-argument-parser
248-
- name: Checkout typing_extensions
249-
uses: actions/checkout@v4
250-
with:
251-
path: typing-extensions-latest
252230
- name: Setup Python
253231
uses: actions/setup-python@v5
254232
with:
255233
python-version: ${{ matrix.python-version }}
256234
- name: Install uv
257235
run: curl -LsSf https://astral.sh/uv/install.sh | sh
236+
- name: Check out typed-argument-parser
237+
run: git clone --depth=1 https://github.com/swansonk14/typed-argument-parser.git || git clone --depth=1 https://github.com/swansonk14/typed-argument-parser.git
238+
- name: Checkout typing_extensions
239+
uses: actions/checkout@v4
240+
with:
241+
path: typing-extensions-latest
258242
- name: Configure git for typed-argument-parser tests
259243
# typed-argument parser does this in their CI,
260244
# and the tests fail unless we do this
@@ -295,22 +279,19 @@ jobs:
295279
runs-on: ubuntu-latest
296280
timeout-minutes: 60
297281
steps:
298-
- name: Checkout mypy for stubtest and mypyc tests
299-
uses: actions/checkout@v4
300-
with:
301-
repository: python/mypy
302-
path: mypy
303-
- name: Checkout typing_extensions
304-
uses: actions/checkout@v4
305-
with:
306-
path: typing-extensions-latest
307282
- name: Setup Python
308283
uses: actions/setup-python@v5
309284
with:
310285
python-version: ${{ matrix.python-version }}
311286
allow-prereleases: true
312287
- name: Install uv
313288
run: curl -LsSf https://astral.sh/uv/install.sh | sh
289+
- name: Checkout mypy for stubtest and mypyc tests
290+
run: git clone --depth=1 https://github.com/python/mypy.git || git clone --depth=1 https://github.com/python/mypy.git
291+
- name: Checkout typing_extensions
292+
uses: actions/checkout@v4
293+
with:
294+
path: typing-extensions-latest
314295
- name: Install mypy test requirements
315296
run: |
316297
set -x
@@ -346,30 +327,29 @@ jobs:
346327
runs-on: ubuntu-latest
347328
timeout-minutes: 60
348329
steps:
349-
- name: Checkout cattrs
350-
uses: actions/checkout@v4
330+
- name: Setup Python
331+
uses: actions/setup-python@v5
351332
with:
352-
repository: python-attrs/cattrs
333+
python-version: ${{ matrix.python-version }}
334+
- name: Checkout cattrs
335+
run: git clone --depth=1 https://github.com/python-attrs/cattrs.git || git clone --depth=1 https://github.com/python-attrs/cattrs.git
353336
- name: Checkout typing_extensions
354337
uses: actions/checkout@v4
355338
with:
356339
path: typing-extensions-latest
357-
- name: Setup Python
358-
uses: actions/setup-python@v5
359-
with:
360-
python-version: ${{ matrix.python-version }}
361340
- name: Install pdm for cattrs
362341
run: pip install pdm
363342
- name: Add latest typing-extensions as a dependency
364343
run: |
344+
cd cattrs
365345
pdm remove typing-extensions
366-
pdm add --dev ./typing-extensions-latest
346+
pdm add --dev ../typing-extensions-latest
367347
- name: Install cattrs test dependencies
368-
run: pdm install --dev -G :all
348+
run: cd cattrs; pdm install --dev -G :all
369349
- name: List all installed dependencies
370-
run: pdm list -vv
350+
run: cd cattrs; pdm list -vv
371351
- name: Run cattrs tests
372-
run: pdm run pytest tests
352+
run: cd cattrs; pdm run pytest tests
373353

374354
create-issue-on-failure:
375355
name: Create an issue if daily tests failed

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version = "4.12.2"
1010
description = "Backported and Experimental Type Hints for Python 3.8+"
1111
readme = "README.md"
1212
requires-python = ">=3.8"
13-
license = { file = "LICENSE" }
13+
license = { text = "PSF-2.0" }
1414
keywords = [
1515
"annotations",
1616
"backport",

0 commit comments

Comments
 (0)