Skip to content

Commit 5944c9e

Browse files
nitins17Google-ML-Automation
authored andcommitted
Install test dependencies from test-requirements.txt instead of requirements.in
PiperOrigin-RevId: 736878834
1 parent 6fa98fc commit 5944c9e

File tree

3 files changed

+6
-26
lines changed

3 files changed

+6
-26
lines changed

.github/workflows/pytest_cpu.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -116,21 +116,8 @@ jobs:
116116
exit 1
117117
- name: Install Python dependencies
118118
run: |
119-
# Remove installation of NVIDIA wheels for CPU tests.
120-
sed -i 's/-r gpu-test-requirements.txt/# -r gpu-test-requirements.txt/g' build/requirements.in
121-
122-
# TODO(srnitin): Remove after uv is installed in the Windows Dockerfile
123119
$JAXCI_PYTHON -m pip install uv~=0.5.30
124-
# python 3.13t cannot compile zstandard 0.23.0 due to
125-
# https://github.com/indygreg/python-zstandard/issues/231. Remove this once zstandard
126-
# has a prebuilt wheel for 3.13t or an env marker is available for free threading python
127-
# in requirements.in.
128-
if [[ $JAXCI_PYTHON =~ "python3.13-nogil" ]]; then
129-
grep -v "zstandard" build/requirements.in > build/requirements_without_zstandard.txt
130-
$JAXCI_PYTHON -m uv pip install -r build/requirements_without_zstandard.txt
131-
else
132-
$JAXCI_PYTHON -m uv pip install -r build/requirements.in
133-
fi
120+
$JAXCI_PYTHON -m uv pip install -r build/test-requirements.txt
134121
# Halt for testing
135122
- name: Wait For Connection
136123
uses: google-ml-infra/actions/ci_connection@main

.github/workflows/pytest_cuda.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,7 @@ jobs:
100100
echo "Skipping the test run."
101101
exit 1
102102
- name: Install Python dependencies
103-
run: |
104-
# python 3.13t cannot compile zstandard 0.23.0 due to
105-
# https://github.com/indygreg/python-zstandard/issues/231. Remove this once zstandard
106-
# has a prebuilt wheel for 3.13t or an env marker is available for free threading python
107-
# in requirements.in.
108-
if [[ $JAXCI_PYTHON =~ "python3.13-nogil" ]]; then
109-
grep -v "zstandard" build/requirements.in > build/requirements_without_zstandard.txt
110-
$JAXCI_PYTHON -m uv pip install -r build/requirements_without_zstandard.txt
111-
else
112-
$JAXCI_PYTHON -m uv pip install -r build/requirements.in
113-
fi
103+
run: $JAXCI_PYTHON -m uv pip install -r build/test-requirements.txt
114104
# Halt for testing
115105
- name: Wait For Connection
116106
uses: google-ml-infra/actions/ci_connection@main

build/test-requirements.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ flatbuffers
77
hypothesis
88
mpmath>=1.3
99
pillow>=10.4.0
10-
# TODO(kanglan): Remove once psutil from portpicker supports python 3.13t
10+
# TODO(kanglan): Remove once psutil from portpicker supports python 3.13t
1111
portpicker; python_version<"3.13"
1212
pytest-xdist
1313
wheel
@@ -19,3 +19,6 @@ matplotlib~=3.8.4; python_version=="3.10"
1919
matplotlib; python_version>="3.11"
2020
opt-einsum
2121
auditwheel
22+
23+
# CPU Pytests crash with NumPy 2.2+ on Linux Aarch64; b/399168632
24+
numpy~=2.1.0; platform_system == "Linux" and platform_machine == "aarch64"

0 commit comments

Comments
 (0)