Skip to content

Commit a08d7aa

Browse files
rasbtrasbt
authored
Uv workflow improvements (rasbt#531)
* Uv workflow improvements * Uv workflow improvements * linter improvements * pytproject.toml fixes * pytproject.toml fixes * pytproject.toml fixes * pytproject.toml fixes * pytproject.toml fixes * pytproject.toml fixes * windows fixes * windows fixes * windows fixes * windows fixes * windows fixes * windows fixes * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix * win32 fix
1 parent 29353c7 commit a08d7aa

File tree

29 files changed

+372
-311
lines changed

29 files changed

+372
-311
lines changed

‎.github/workflows/basic-tests-linux.yml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,24 @@ jobs:
3232

3333
- name: Install dependencies
3434
run: |
35-
python -m pip install --upgrade pip
36-
pip install uv
37-
uv venv --python=python3.10
38-
source .venv/bin/activate
39-
uv pip install pytest nbval
40-
if [ -f requirements.txt ]; then uv pip install -r requirements.txt; fi
35+
curl -LsSf https://astral.sh/uv/install.sh | sh
36+
uv python install 3.10
37+
uv add . --dev
4138
uv pip install -r ch05/07_gpt_to_llama/tests/test-requirements-extra.txt
42-
uv pip install pytest
39+
uv add pytest-ruff nbval
4340
4441
- name: Test Selected Python Scripts
4542
run: |
4643
source .venv/bin/activate
47-
pytest setup/02_installing-python-libraries/tests.py
48-
pytest ch04/01_main-chapter-code/tests.py
49-
pytest ch05/01_main-chapter-code/tests.py
50-
pytest ch05/07_gpt_to_llama/tests/tests.py
51-
pytest ch06/01_main-chapter-code/tests.py
44+
pytest --ruff setup/02_installing-python-libraries/tests.py
45+
pytest --ruff ch04/01_main-chapter-code/tests.py
46+
pytest --ruff ch05/01_main-chapter-code/tests.py
47+
pytest --ruff ch05/07_gpt_to_llama/tests/tests.py
48+
pytest --ruff ch06/01_main-chapter-code/tests.py
5249
5350
- name: Validate Selected Jupyter Notebooks
5451
run: |
5552
source .venv/bin/activate
56-
pytest --nbval ch02/01_main-chapter-code/dataloader.ipynb
57-
pytest --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
58-
pytest --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb
53+
pytest --ruff --nbval ch02/01_main-chapter-code/dataloader.ipynb
54+
pytest --ruff --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
55+
pytest --ruff --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb

‎.github/workflows/basic-tests-macos.yml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,24 @@ jobs:
3232

3333
- name: Install dependencies
3434
run: |
35-
python -m pip install --upgrade pip
36-
pip install uv
37-
uv venv --python=python3.10
38-
source .venv/bin/activate
39-
uv pip install pytest nbval
40-
if [ -f requirements.txt ]; then uv pip install -r requirements.txt; fi
35+
curl -LsSf https://astral.sh/uv/install.sh | sh
36+
uv python install 3.10
37+
uv add . --dev
4138
uv pip install -r ch05/07_gpt_to_llama/tests/test-requirements-extra.txt
42-
uv pip install pytest
39+
uv add pytest-ruff nbval
4340
4441
- name: Test Selected Python Scripts
4542
run: |
4643
source .venv/bin/activate
47-
pytest setup/02_installing-python-libraries/tests.py
48-
pytest ch04/01_main-chapter-code/tests.py
49-
pytest ch05/01_main-chapter-code/tests.py
50-
pytest ch05/07_gpt_to_llama/tests/tests.py
51-
pytest ch06/01_main-chapter-code/tests.py
44+
pytest --ruff setup/02_installing-python-libraries/tests.py
45+
pytest --ruff ch04/01_main-chapter-code/tests.py
46+
pytest --ruff ch05/01_main-chapter-code/tests.py
47+
pytest --ruff ch05/07_gpt_to_llama/tests/tests.py
48+
pytest --ruff ch06/01_main-chapter-code/tests.py
5249
5350
- name: Validate Selected Jupyter Notebooks
5451
run: |
5552
source .venv/bin/activate
56-
pytest --nbval ch02/01_main-chapter-code/dataloader.ipynb
57-
pytest --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
58-
pytest --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb
53+
pytest --ruff --nbval ch02/01_main-chapter-code/dataloader.ipynb
54+
pytest --ruff --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
55+
pytest --ruff --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb

‎.github/workflows/basic-tests-old-pytorch.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,25 @@ jobs:
3535

3636
- name: Install dependencies
3737
run: |
38-
python -m pip install --upgrade pip setuptools wheel
39-
pip install uv
40-
uv venv --python=python3.10
41-
source .venv/bin/activate
42-
uv pip install pytest nbval
43-
uv pip install torch==${{ matrix.pytorch-version }}
44-
uv pip install -r requirements.txt
38+
curl -LsSf https://astral.sh/uv/install.sh | sh
39+
uv python install 3.10
40+
uv add . --dev
4541
uv pip install -r ch05/07_gpt_to_llama/tests/test-requirements-extra.txt
46-
uv pip install pytest
42+
uv add torch==${{ matrix.pytorch-version }}
43+
uv add pytest-ruff nbval
4744
4845
- name: Test Selected Python Scripts
4946
run: |
5047
source .venv/bin/activate
51-
pytest setup/02_installing-python-libraries/tests.py
52-
pytest ch04/01_main-chapter-code/tests.py
53-
pytest ch05/01_main-chapter-code/tests.py
54-
pytest ch05/07_gpt_to_llama/tests/tests.py
55-
pytest ch06/01_main-chapter-code/tests.py
48+
pytest --ruff setup/02_installing-python-libraries/tests.py
49+
pytest --ruff ch04/01_main-chapter-code/tests.py
50+
pytest --ruff ch05/01_main-chapter-code/tests.py
51+
pytest --ruff ch05/07_gpt_to_llama/tests/tests.py
52+
pytest --ruff ch06/01_main-chapter-code/tests.py
5653
5754
- name: Validate Selected Jupyter Notebooks
5855
run: |
5956
source .venv/bin/activate
60-
pytest --nbval ch02/01_main-chapter-code/dataloader.ipynb
61-
pytest --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
62-
pytest --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb
57+
pytest --ruff --nbval ch02/01_main-chapter-code/dataloader.ipynb
58+
pytest --ruff --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
59+
pytest --ruff --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb

‎.github/workflows/basic-tests-pytorch-rc.yml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,25 @@ jobs:
3131

3232
- name: Install dependencies
3333
run: |
34-
python -m pip install --upgrade pip
35-
pip install uv
36-
uv venv --python=python3.10
37-
source .venv/bin/activate
38-
uv pip install pytest nbval
39-
if [ -f requirements.txt ]; then uv pip install -r requirements.txt; fi
34+
curl -LsSf https://astral.sh/uv/install.sh | sh
35+
uv python install 3.10
36+
uv add . --dev
4037
uv pip install -r ch05/07_gpt_to_llama/tests/test-requirements-extra.txt
38+
uv add pytest-ruff nbval
4139
uv pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu
42-
uv pip install pytest
4340
4441
- name: Test Selected Python Scripts
4542
run: |
4643
source .venv/bin/activate
47-
pytest setup/02_installing-python-libraries/tests.py
48-
pytest ch04/01_main-chapter-code/tests.py
49-
pytest ch05/01_main-chapter-code/tests.py
50-
pytest ch05/07_gpt_to_llama/tests/tests.py
51-
pytest ch06/01_main-chapter-code/tests.py
44+
pytest --ruff setup/02_installing-python-libraries/tests.py
45+
pytest --ruff ch04/01_main-chapter-code/tests.py
46+
pytest --ruff ch05/01_main-chapter-code/tests.py
47+
pytest --ruff ch05/07_gpt_to_llama/tests/tests.py
48+
pytest --ruff ch06/01_main-chapter-code/tests.py
5249
5350
- name: Validate Selected Jupyter Notebooks
5451
run: |
5552
source .venv/bin/activate
56-
pytest --nbval ch02/01_main-chapter-code/dataloader.ipynb
57-
pytest --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
58-
pytest --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb
53+
pytest --ruff --nbval ch02/01_main-chapter-code/dataloader.ipynb
54+
pytest --ruff --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
55+
pytest --ruff --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb

‎.github/workflows/basic-tests-windows-pip.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Code tests (Windows pip)
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths:
7+
- '**/*.py'
8+
- '**/*.ipynb'
9+
- '**/*.yaml'
10+
- '**/*.yml'
11+
- '**/*.sh'
12+
pull_request:
13+
branches: [ main ]
14+
paths:
15+
- '**/*.py'
16+
- '**/*.ipynb'
17+
- '**/*.yaml'
18+
- '**/*.yml'
19+
- '**/*.sh'
20+
21+
jobs:
22+
test:
23+
runs-on: windows-latest
24+
25+
steps:
26+
- name: Checkout Code
27+
uses: actions/checkout@v4
28+
29+
- name: Set up Python
30+
uses: actions/setup-python@v5
31+
with:
32+
python-version: '3.10'
33+
34+
- name: Install dependencies
35+
shell: pwsh
36+
run: |
37+
pip install --upgrade pip
38+
pip install -r requirements.txt
39+
pip install tensorflow-io-gcs-filesystem==0.31.0 # Explicit for Windows
40+
pip install -r ch05/07_gpt_to_llama/tests/test-requirements-extra.txt
41+
pip install pytest-ruff nbval
42+
43+
- name: Run Python Tests
44+
shell: pwsh
45+
run: |
46+
pytest --ruff setup/02_installing-python-libraries/tests.py
47+
pytest --ruff ch04/01_main-chapter-code/tests.py
48+
pytest --ruff ch05/01_main-chapter-code/tests.py
49+
pytest --ruff ch05/07_gpt_to_llama/tests/tests.py
50+
pytest --ruff ch06/01_main-chapter-code/tests.py
51+
52+
- name: Run Jupyter Notebook Tests
53+
shell: pwsh
54+
run: |
55+
pytest --ruff --nbval ch02/01_main-chapter-code/dataloader.ipynb
56+
pytest --ruff --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
57+
pytest --ruff --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb

‎.github/workflows/basic-tests-windows-uv.yml.disabled‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Code tests (Windows)
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths:
7+
- '**/*.py'
8+
- '**/*.ipynb'
9+
- '**/*.yaml'
10+
- '**/*.yml'
11+
- '**/*.sh'
12+
pull_request:
13+
branches: [ main ]
14+
paths:
15+
- '**/*.py'
16+
- '**/*.ipynb'
17+
- '**/*.yaml'
18+
- '**/*.yml'
19+
- '**/*.sh'
20+
21+
jobs:
22+
test:
23+
runs-on: windows-latest
24+
25+
steps:
26+
- name: Checkout Code
27+
uses: actions/checkout@v4
28+
29+
- name: Install uv
30+
shell: pwsh
31+
run: |
32+
Invoke-WebRequest -Uri "https://astral.sh/uv/install.ps1" -OutFile "uv_install.ps1"
33+
& .\uv_install.ps1
34+
35+
- name: Install dependencies with uv
36+
shell: pwsh
37+
run: |
38+
uv venv --python=python3.10
39+
uv pip install tensorflow-io-gcs-filesystem==0.31.0 # Explicit for Windows
40+
uv pip install -r requirements.txt
41+
uv pip install pytest-ruff
42+
43+
- name: Run Python Tests
44+
shell: pwsh
45+
run: |
46+
uv run pytest --ruff setup/02_installing-python-libraries/tests.py
47+
uv run pytest --ruff ch04/01_main-chapter-code/tests.py
48+
uv run pytest --ruff ch05/01_main-chapter-code/tests.py
49+
uv run pytest --ruff ch05/07_gpt_to_llama/tests/tests.py
50+
uv run pytest --ruff ch06/01_main-chapter-code/tests.py
51+
52+
- name: Run Jupyter Notebook Tests
53+
shell: pwsh
54+
run: |
55+
uv run pytest --ruff --nbval ch02/01_main-chapter-code/dataloader.ipynb
56+
uv run pytest --ruff --nbval ch03/01_main-chapter-code/multihead-attention.ipynb
57+
uv run pytest --ruff --nbval ch02/04_bonus_dataloader-intuition/dataloader-intuition.ipynb

‎.github/workflows/basic-tests-windows.yml‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎.github/workflows/check-links.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,16 @@ jobs:
2222

2323
- name: Install dependencies
2424
run: |
25-
python -m pip install --upgrade pip
26-
pip install uv
27-
uv venv --python=python3.10
28-
source .venv/bin/activate
29-
uv pip install pytest pytest-check-links
25+
curl -LsSf https://astral.sh/uv/install.sh | sh
26+
uv python install 3.10
27+
uv add . --dev
28+
uv add pytest-ruff pytest-check-links
3029
# Current version of retry doesn't work well if there are broken non-URL links
3130
# pip install pytest pytest-check-links pytest-retry
32-
uv pip install pytest pytest-check-links
3331
3432
- name: Check links
3533
run: |
3634
source .venv/bin/activate
37-
pytest --check-links ./ --check-links-ignore "https://platform.openai.com/*" --check-links-ignore "https://openai.com/*" --check-links-ignore "https://arena.lmsys.org" --check-links-ignore https://unsloth.ai/blog/gradient --check-links-ignore "https://www.reddit.com/r/*" --check-links-ignore "https://code.visualstudio.com/*" --check-links-ignore https://arxiv.org/* --check-links-ignore "https://ai.stanford.edu/~amaas/data/sentiment/"
35+
pytest --ruff --check-links ./ --check-links-ignore "https://platform.openai.com/*" --check-links-ignore "https://openai.com/*" --check-links-ignore "https://arena.lmsys.org" --check-links-ignore https://unsloth.ai/blog/gradient --check-links-ignore "https://www.reddit.com/r/*" --check-links-ignore "https://code.visualstudio.com/*" --check-links-ignore https://arxiv.org/* --check-links-ignore "https://ai.stanford.edu/~amaas/data/sentiment/"
3836
# pytest --check-links ./ --check-links-ignore "https://platform.openai.com/*" --check-links-ignore "https://arena.lmsys.org" --retries 2 --retry-delay 5
3937

‎.github/workflows/check-spelling-errors.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ jobs:
2222

2323
- name: Install codespell
2424
run: |
25-
python -m pip install --upgrade pip
26-
pip install uv
27-
uv venv --python=python3.10
28-
source .venv/bin/activate
29-
uv pip install codespell
25+
curl -LsSf https://astral.sh/uv/install.sh | sh
26+
uv python install 3.10
27+
uv add . --dev
28+
uv add codespell
3029
3130
- name: Run codespell
3231
run: |

0 commit comments

Comments
 (0)