Skip to content

Commit 88b3902

Browse files
author
Christopher Rowley
committed
run freethreading tests as cases of existing jobs and include python tests
1 parent 38527e1 commit 88b3902

File tree

1 file changed

+20
-41
lines changed

1 file changed

+20
-41
lines changed

.github/workflows/tests.yml

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ on:
99
- main
1010
tags:
1111
- '*'
12-
workflow_dispatch:
1312

1413
jobs:
1514
julia:
16-
name: Julia (${{ matrix.jlversion }}, ${{ matrix.os }}, ${{ matrix.pythonexe }})
15+
name: Julia (${{ matrix.jlversion }}, ${{ matrix.os }}, ${{ matrix.pythonexe }} ${{ matrix.pyversion}})
1716
runs-on: ${{ matrix.os }}
1817
strategy:
1918
fail-fast: false
@@ -22,11 +21,18 @@ jobs:
2221
os: [ubuntu-latest, windows-latest, macos-latest]
2322
jlversion: ['1','1.10']
2423
pythonexe: ['@CondaPkg']
24+
pyversion: ['3']
2525
include:
2626
- arch: x64
2727
os: ubuntu-latest
2828
jlversion: '1'
2929
pythonexe: python
30+
pyversion: '3'
31+
- arch: x64
32+
os: ubuntu-latest
33+
jlversion: '1'
34+
pythonexe: python
35+
pyversion: '3.14t'
3036

3137
steps:
3238
- uses: actions/checkout@v6
@@ -44,19 +50,26 @@ jobs:
4450
env:
4551
PYTHON: python
4652

53+
- name: Install Python
54+
id: setup-python
55+
uses: actions/setup-python@v6
56+
if: ${{ matrix.pythonexe == 'python' }}
57+
with:
58+
python-version: ${{ matrix.pyversion }}
59+
4760
- name: Build PyCall
4861
if: ${{ matrix.pythonexe == 'python' }}
4962
run: |
5063
julia --project=test -e 'import Pkg; Pkg.build("PyCall")'
5164
env:
52-
PYTHON: python
65+
PYTHON: ${{ steps.setup-python.outputs.python-path }}
5366

5467
- name: Run tests
5568
uses: julia-actions/julia-runtest@v1
5669
env:
5770
JULIA_DEBUG: PythonCall
5871
JULIA_NUM_THREADS: '2'
59-
PYTHON: python
72+
PYTHON: ${{ steps.setup-python.outputs.python-path }}
6073
JULIA_PYTHONCALL_EXE: ${{ matrix.pythonexe }}
6174

6275
- name: Process coverage
@@ -67,43 +80,6 @@ jobs:
6780
env:
6881
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6982

70-
julia-ft:
71-
name: Julia (1, ubuntu-latest, python3.14t)
72-
runs-on: ubuntu-latest
73-
74-
steps:
75-
- uses: actions/checkout@v6
76-
77-
- name: Set up Julia 1
78-
uses: julia-actions/setup-julia@v2
79-
with:
80-
version: '1'
81-
arch: x64
82-
83-
- uses: julia-actions/cache@v2
84-
85-
- name: Set up micromamba (python3.14t)
86-
id: micromamba
87-
uses: mamba-org/setup-micromamba@v2
88-
with:
89-
environment-name: py314t
90-
create-args: >-
91-
-c conda-forge python=3.14.*=*cp314t*
92-
cache-environment: true
93-
94-
- name: Build package
95-
uses: julia-actions/julia-buildpkg@v1
96-
env:
97-
PYTHON: ${{ steps.micromamba.outputs.environment-path }}/bin/python
98-
99-
- name: Run tests
100-
uses: julia-actions/julia-runtest@v1
101-
env:
102-
JULIA_DEBUG: PythonCall
103-
JULIA_NUM_THREADS: '2'
104-
PYTHON: ${{ steps.micromamba.outputs.environment-path }}/bin/python
105-
JULIA_PYTHONCALL_EXE: ${{ steps.micromamba.outputs.environment-path }}/bin/python
106-
10783
python:
10884
name: Python (${{ matrix.pyversion }}, ${{ matrix.os }}, ${{ matrix.juliaexe }})
10985
runs-on: ${{ matrix.os }}
@@ -117,6 +93,9 @@ jobs:
11793
- os: ubuntu-latest
11894
pyversion: '3'
11995
juliaexe: julia
96+
- os: ubuntu-latest
97+
pyversion: '3.14t'
98+
juliaexe: '@JuliaPkg'
12099
env:
121100
MANUAL_TEST_PROJECT: /tmp/juliacall-test-project
122101
PYTHON_JULIACALL_THREADS: '2'

0 commit comments

Comments
 (0)