Skip to content

Commit 10beba3

Browse files
sanders41sanders41
committed
Merge remote-tracking branch 'origin/main' into bump-version
2 parents b8afb03 + ad82e98 commit 10beba3

File tree

35 files changed

+449
-836
lines changed

35 files changed

+449
-836
lines changed

‎.github/workflows/testing.yml‎

Lines changed: 21 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ jobs:
108108
run: cargo build --release
109109
- name: Run creation
110110
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 1
111-
- name: Install Dependencies
112-
working-directory: ${{ env.WORKING_DIR }}
113-
run: |
114-
uv lock
115-
uv sync --frozen
116111
- name: MyPy
117112
working-directory: ${{ env.WORKING_DIR }}
118113
run: uv run mypy .
@@ -150,15 +145,9 @@ jobs:
150145
- name: Run creation
151146
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 1
152147
shell: bash
153-
- name: Install Dependencies
154-
working-directory: ${{ env.WORKING_DIR }}
155-
run: |
156-
uv lock
157-
uv sync --frozen
158148
- name: Pre-commit check
159149
working-directory: ${{ env.WORKING_DIR }}
160150
run: |
161-
uv run pre-commit install
162151
git add .
163152
uv run pre-commit run --all-files
164153
- name: Test with pytest
@@ -191,9 +180,6 @@ jobs:
191180
run: cargo build --release
192181
- name: Run creation
193182
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 2
194-
- name: Install Dependencies
195-
working-directory: ${{ env.WORKING_DIR }}
196-
run: poetry install
197183
- name: MyPy
198184
working-directory: ${{ env.WORKING_DIR }}
199185
run: poetry run mypy .
@@ -231,13 +217,9 @@ jobs:
231217
- name: Run creation
232218
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 2
233219
shell: bash
234-
- name: Install Dependencies
235-
working-directory: ${{ env.WORKING_DIR }}
236-
run: poetry install
237220
- name: Pre-commit check
238221
working-directory: ${{ env.WORKING_DIR }}
239222
run: |
240-
poetry run pre-commit install
241223
git add .
242224
poetry run pre-commit run --all-files
243225
- name: Test with pytest
@@ -273,12 +255,6 @@ jobs:
273255
run: cargo build --release
274256
- name: Run creation
275257
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 3
276-
- name: Install Dependencies
277-
working-directory: ${{ env.WORKING_DIR }}
278-
run: |
279-
uv lock
280-
uv sync --frozen
281-
uv run maturin build
282258
- name: MyPy
283259
working-directory: ${{ env.WORKING_DIR }}
284260
run: just mypy
@@ -322,16 +298,13 @@ jobs:
322298
- name: Run creation
323299
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 3
324300
shell: bash
325-
- name: Install Dependencies
301+
- name: Compile Rust
326302
working-directory: ${{ env.WORKING_DIR }}
327303
run: |
328-
uv lock
329-
uv sync --frozen
330304
uv run maturin build
331305
- name: Pre-commit check
332306
working-directory: ${{ env.WORKING_DIR }}
333307
run: |
334-
uv run pre-commit install
335308
git add .
336309
uv run pre-commit run --all-files
337310
- name: Test with pytest
@@ -358,20 +331,24 @@ jobs:
358331
- name: Run creation
359332
run: |
360333
./scripts/ci_run.sh ${{ matrix.project_type }} 4
361-
- name: Install Dependencies
362-
working-directory: ${{ env.WORKING_DIR }}
363-
run: |
364-
python -m pip install -U pip
365-
python -m pip install -r requirements-dev.txt
366334
- name: MyPy
367335
working-directory: ${{ env.WORKING_DIR }}
368-
run: mypy .
336+
run: $PYTHON -m mypy .
337+
shell: bash
338+
env:
339+
PYTHON: ${{ runner.os == 'Windows' && '.venv/Scripts/python.exe' || '.venv/bin/python' }}
369340
- name: ruff check
370341
working-directory: ${{ env.WORKING_DIR }}
371-
run: ruff check .
342+
run: $PYTHON -m ruff check .
343+
shell: bash
344+
env:
345+
PYTHON: ${{ runner.os == 'Windows' && '.venv/Scripts/python.exe' || '.venv/bin/python' }}
372346
- name: ruff format
373347
working-directory: ${{ env.WORKING_DIR }}
374-
run: ruff format --check .
348+
run: $PYTHON -m ruff format --check .
349+
shell: bash
350+
env:
351+
PYTHON: ${{ runner.os == 'Windows' && '.venv/Scripts/python.exe' || '.venv/bin/python' }}
375352
setuptools-test:
376353
strategy:
377354
fail-fast: false
@@ -394,18 +371,18 @@ jobs:
394371
- name: Run creation
395372
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 4
396373
shell: bash
397-
- name: Install Dependencies
398-
working-directory: ${{ env.WORKING_DIR }}
399-
run: |
400-
python -m pip install -U pip
401-
python -m pip install -r requirements-dev.txt
402374
- name: Pre-commit check
403375
working-directory: ${{ env.WORKING_DIR }}
404376
run: |
405-
pre-commit install
406377
git add .
407-
pre-commit run --all-files
378+
$PYTHON -m pre_commit run --all-files
379+
shell: bash
380+
env:
381+
PYTHON: ${{ runner.os == 'Windows' && '.venv/Scripts/python.exe' || '.venv/bin/python' }}
408382
- name: Test with pytest
409383
working-directory: ${{ env.WORKING_DIR }}
410384
if: matrix.project_type == 'application'
411-
run: python -m pytest
385+
run: $PYTHON -m pytest
386+
shell: bash
387+
env:
388+
PYTHON: ${{ runner.os == 'Windows' && '.venv/Scripts/python.exe' || '.venv/bin/python' }}

‎.github/workflows/testing_fastapi.yml‎

Lines changed: 14 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,9 @@ jobs:
5050
- name: Run creation
5151
run: ./scripts/ci_run_fastapi.sh "fastapi" 1
5252
shell: bash
53-
- name: Install Dependencies
54-
working-directory: ${{ env.WORKING_DIR }}
55-
run: |
56-
uv lock
57-
uv sync --frozen
5853
- name: Pre-commit check
5954
working-directory: ${{ env.WORKING_DIR }}
6055
run: |
61-
uv run pre-commit install
6256
git add .
6357
uv run pre-commit run --all-files
6458
- name: make .env
@@ -94,15 +88,9 @@ jobs:
9488
- name: Run creation
9589
run: ./scripts/ci_run_fastapi.sh ${{ matrix.project_type }} 1
9690
shell: bash
97-
- name: Install Dependencies
98-
working-directory: ${{ env.WORKING_DIR }}
99-
run: |
100-
uv lock
101-
uv sync --frozen
10291
- name: Pre-commit check
10392
working-directory: ${{ env.WORKING_DIR }}
10493
run: |
105-
uv run pre-commit install
10694
git add .
10795
uv run pre-commit run --all-files
10896
- name: Test with pytest
@@ -137,13 +125,9 @@ jobs:
137125
- name: Run creation
138126
run: ./scripts/ci_run_fastapi.sh "fastapi" 2
139127
shell: bash
140-
- name: Install Dependencies
141-
working-directory: ${{ env.WORKING_DIR }}
142-
run: poetry install
143128
- name: Pre-commit check
144129
working-directory: ${{ env.WORKING_DIR }}
145130
run: |
146-
poetry run pre-commit install
147131
git add .
148132
poetry run pre-commit run --all-files
149133
- name: make .env
@@ -183,13 +167,9 @@ jobs:
183167
- name: Run creation
184168
run: ./scripts/ci_run_fastapi.sh ${{ matrix.project_type }} 2
185169
shell: bash
186-
- name: Install Dependencies
187-
working-directory: ${{ env.WORKING_DIR }}
188-
run: poetry install
189170
- name: Pre-commit check
190171
working-directory: ${{ env.WORKING_DIR }}
191172
run: |
192-
poetry run pre-commit install
193173
git add .
194174
poetry run pre-commit run --all-files
195175
- name: Test with pytest
@@ -218,17 +198,11 @@ jobs:
218198
- name: Run creation
219199
run: ./scripts/ci_run_fastapi.sh "fastapi" 4
220200
shell: bash
221-
- name: Install Dependencies
222-
working-directory: ${{ env.WORKING_DIR }}
223-
run: |
224-
python -m pip install -U pip
225-
python -m pip install -r requirements-dev.txt -r requirements.txt
226201
- name: Pre-commit check
227202
working-directory: ${{ env.WORKING_DIR }}
228203
run: |
229-
pre-commit install
230204
git add .
231-
pre-commit run --all-files
205+
.venv/bin/pre-commit run --all-files
232206
- name: make .env
233207
working-directory: ${{ env.WORKING_DIR }}
234208
run: touch .env
@@ -237,7 +211,7 @@ jobs:
237211
run: docker compose up -d
238212
- name: Test with pytest
239213
working-directory: ${{ env.WORKING_DIR }}
240-
run: python -m pytest -n auto
214+
run: .venv/bin/pytest -n auto
241215
test-setuptools-non-fastapi-project:
242216
name: test-fastapi-setuptools-setup-non-fastapi
243217
strategy:
@@ -260,21 +234,15 @@ jobs:
260234
- name: Run creation
261235
run: ./scripts/ci_run_fastapi.sh ${{ matrix.project_type }} 4
262236
shell: bash
263-
- name: Install Dependencies
264-
working-directory: ${{ env.WORKING_DIR }}
265-
run: |
266-
python -m pip install -U pip
267-
python -m pip install -r requirements-dev.txt
268237
- name: Pre-commit check
269238
working-directory: ${{ env.WORKING_DIR }}
270239
run: |
271-
pre-commit install
272240
git add .
273-
pre-commit run --all-files
241+
.venv/bin/pre-commit run --all-files
274242
- name: Test with pytest
275243
working-directory: ${{ env.WORKING_DIR }}
276244
if: matrix.project_type == 'application'
277-
run: python -m pytest
245+
run: .venv/bin/pytest
278246
test-pyo3-uv-fastapi-project:
279247
name: test-fastapi-pyo3-uv-setup-fastapi
280248
strategy:
@@ -299,16 +267,9 @@ jobs:
299267
- name: Run creation
300268
run: ./scripts/ci_run_fastapi.sh "fastapi" 3
301269
shell: bash
302-
- name: Install Dependencies
303-
working-directory: ${{ env.WORKING_DIR }}
304-
run: |
305-
uv lock
306-
uv sync --frozen
307-
uv run maturin build
308270
- name: Pre-commit check
309271
working-directory: ${{ env.WORKING_DIR }}
310272
run: |
311-
uv run pre-commit install
312273
git add .
313274
uv run pre-commit run --all-files
314275
- name: make .env
@@ -344,16 +305,13 @@ jobs:
344305
- name: Run creation
345306
run: ./scripts/ci_run_fastapi.sh ${{ matrix.project_type }} 3
346307
shell: bash
347-
- name: Install Dependencies
308+
- name: Compile Rust
348309
working-directory: ${{ env.WORKING_DIR }}
349310
run: |
350-
uv lock
351-
uv sync --frozen
352-
uv run maturin build
311+
uv run maturin develop
353312
- name: Pre-commit check
354313
working-directory: ${{ env.WORKING_DIR }}
355314
run: |
356-
uv run pre-commit install
357315
git add .
358316
uv run pre-commit run --all-files
359317
- name: Test with pytest
@@ -382,18 +340,15 @@ jobs:
382340
- name: Run creation
383341
run: ./scripts/ci_run_fastapi.sh "fastapi" 3 2
384342
shell: bash
385-
- name: Install Dependencies
343+
- name: Compile Rust
386344
working-directory: ${{ env.WORKING_DIR }}
387345
run: |
388-
python -m pip install -U pip
389-
python -m pip install -r requirements.txt -r requirements-dev.txt
390-
python -m maturin build
346+
.venv/bin/maturin develop
391347
- name: Pre-commit check
392348
working-directory: ${{ env.WORKING_DIR }}
393349
run: |
394-
pre-commit install
395350
git add .
396-
pre-commit run --all-files
351+
.venv/bin/pre-commit run --all-files
397352
- name: make .env
398353
working-directory: ${{ env.WORKING_DIR }}
399354
run: touch .env
@@ -402,7 +357,7 @@ jobs:
402357
run: docker compose up -d
403358
- name: Test with pytest
404359
working-directory: ${{ env.WORKING_DIR }}
405-
run: python -m pytest -n auto
360+
run: .venv/bin/pytest -n auto
406361
test-pyo3-setuptools-non-fastapi-project:
407362
name: test-fastapi-setuptools-pyo3-setup-non-fastapi
408363
strategy:
@@ -425,19 +380,16 @@ jobs:
425380
- name: Run creation
426381
run: ./scripts/ci_run_fastapi.sh ${{ matrix.project_type }} 3 2
427382
shell: bash
428-
- name: Install Dependencies
383+
- name: Compile Rust
429384
working-directory: ${{ env.WORKING_DIR }}
430385
run: |
431-
python -m pip install -U pip
432-
python -m pip install -r requirements-dev.txt
433-
python -m maturin build
386+
.venv/bin/maturin develop
434387
- name: Pre-commit check
435388
working-directory: ${{ env.WORKING_DIR }}
436389
run: |
437-
pre-commit install
438390
git add .
439-
pre-commit run --all-files
391+
.venv/bin/pre-commit run --all-files
440392
- name: Test with pytest
441393
working-directory: ${{ env.WORKING_DIR }}
442394
if: matrix.project_type == 'application'
443-
run: python -m pytest
395+
run: .venv/bin/pytest

0 commit comments

Comments
 (0)