Skip to content

Commit d25cc25

Browse files
authored
Merge branch 'main' into srnitin/test-scripts-workflows
2 parents 88582f1 + 5652db4 commit d25cc25

File tree

5 files changed

+16
-122
lines changed

5 files changed

+16
-122
lines changed

.github/workflows/pytest_cpu.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,15 @@ jobs:
7373
7474
# Get the major and minor version of Python.
7575
# E.g if JAXCI_HERMETIC_PYTHON_VERSION=3.10, then python_major_minor=310
76-
python_major_minor=$(echo "$JAXCI_HERMETIC_PYTHON_VERSION" | tr -d '.')
76+
# E.g if JAXCI_HERMETIC_PYTHON_VERSION=3.13-nogil, then python_major_minor=313t
77+
python_major_minor=$(echo "${JAXCI_HERMETIC_PYTHON_VERSION//-nogil/t}" | tr -d '.')
7778
7879
echo "OS=${os}" >> $GITHUB_ENV
7980
echo "ARCH=${arch}" >> $GITHUB_ENV
80-
echo "PYTHON_MAJOR_MINOR=${python_major_minor}" >> $GITHUB_ENV
81+
# Python wheels follow a naming convention: standard wheels use the pattern
82+
# `*-cp<py_version>-cp<py_version>-*`, while free-threaded wheels use
83+
# `*-cp<py_version>-cp<py_version>t-*`.
84+
echo "PYTHON_MAJOR_MINOR=cp${python_major_minor%t}-cp${python_major_minor}-" >> $GITHUB_ENV
8185
- name: Download jaxlib wheel from GCS (non-Windows runs)
8286
if: ${{ !contains(inputs.runner, 'windows-x86') }}
8387
run: >-

.github/workflows/pytest_tpu.yml

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

.github/workflows/wait-for-connection-test.yaml

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

.github/workflows/wheel_tests_nightly_release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,13 @@ jobs:
3636
# Runner OS and Python values need to match the matrix stategy of our internal CI jobs
3737
# that build the wheels.
3838
runner: ["linux-x86-n2-64", "linux-arm64-t2a-48", "windows-x86-n2-64"]
39-
python: ["3.10","3.11", "3.12", "3.13"]
39+
python: ["3.10","3.11", "3.12", "3.13", "3.13-nogil"]
4040
enable-x64: [0]
41+
exclude:
42+
- runner: ["linux-arm64-t2a-48"]
43+
python: ["3.13-nogil"]
44+
- runner: ["windows-x86-n2-64"]
45+
python: ["3.13-nogil"]
4146
with:
4247
runner: ${{ matrix.runner }}
4348
python: ${{ matrix.python }}

build/requirements.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ scipy>=1.13.1
1616

1717
ml_dtypes>=0.4.0
1818
opt_einsum
19-
zstandard
19+
# python 3.13t cannot compile zstandard 0.23.0 due to
20+
# https://github.com/indygreg/python-zstandard/issues/231.
21+
# pip cannot differentiate between python 3.13 and 3.13t.
22+
zstandard; python_version<="3.12"
2023
etils[epath]
2124
# TODO(ybaturina): remove setuptools version
2225
setuptools<71.0.0

0 commit comments

Comments
 (0)