Skip to content

Commit ec73c44

Browse files
fix python version in mac and qt locqtion in windows
1 parent 8581e52 commit ec73c44

3 files changed

Lines changed: 14 additions & 20 deletions

File tree

.github/workflows/actions_build/action.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,24 @@ runs:
5858
path: ~/software
5959
key: ${{ runner.os }}-${{ steps.get-os-version.outputs.release }}_geant4_${{ env.GEANT4_VERSION }}_itk_${{ env.ITK_VERSION }}_build
6060
restore-keys: ${{ runner.os }}-${{ steps.get-os-version.outputs.release }}_geant4_${{ env.GEANT4_VERSION }}_itk_${{ env.ITK_VERSION }}_build
61-
- name: Set up Python 3.14 in Linux and MacOS, handled by Conda in Windows
62-
if: (inputs.os == 'ubuntu-24.04') || (inputs.os == 'ubuntu-24.04-arm') || (inputs.os == 'macos-15') || (inputs.os == 'macos-15-intel')
61+
- name: Set up Python 3.14 in Linux
62+
if: (inputs.os == 'ubuntu-24.04') || (inputs.os == 'ubuntu-24.04-arm')
6363
uses: actions/setup-python@v6
6464
with:
6565
python-version: '3.14'
66-
- name: Set up Miniconda in Windows with pinned python 3.14
67-
if: (inputs.os == 'windows-2025') || (inputs.os == 'windows-11-arm')
68-
uses: conda-incubator/setup-miniconda@v3
69-
with:
70-
miniconda-version: "latest"
71-
auto-update-conda: true
72-
activate-environment: opengate_core
73-
python-version: '3.14'
74-
- name: Set up Miniconda in MacOS with variable python version
66+
- name: Set up Python 3.14 in Macos
7567
if: (inputs.os == 'macos-15') || (inputs.os == 'macos-15-intel')
68+
uses: actions/setup-python@v6
69+
with:
70+
python-version: ${{ inputs.python-version }}
71+
- name: Set up Miniconda in Windows and Macos with pinned python 3.14
72+
if: (inputs.os == 'windows-2025') || (inputs.os == 'windows-11-arm') || (inputs.os == 'macos-15') || (inputs.os == 'macos-15-intel')
7673
uses: conda-incubator/setup-miniconda@v3
7774
with:
7875
miniconda-version: "latest"
7976
auto-update-conda: true
8077
activate-environment: opengate_core
81-
python-version: ${{ inputs.python-version }}
78+
python-version: '3.14'
8279
- name: Create opengate_core Wheel Linux
8380
if: (inputs.os == 'ubuntu-24.04') || (inputs.os == 'ubuntu-24.04-arm')
8481
env:

.github/workflows/actions_build/ci_build_wheel_macos.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ source $GITHUB_WORKSPACE/env_dump.txt
66
mkdir -p $HOME/software
77

88
pip install wget colored delocate
9-
10-
if [[ ${MATRIX_PYTHON_VERSION} == "3.10" ]]; then
11-
pip install cibuildwheel[uv]==2.23.4
12-
else
13-
pip install cibuildwheel[uv]==3.4.0
14-
fi
9+
pip install cibuildwheel[uv]==3.4.0
1510

1611
export LDFLAGS="-L/usr/local/opt/llvm/lib"
1712
export CPPFLAGS="-I/usr/local/opt/llvm/include -fopenmp"

.github/workflows/actions_build/ci_build_wheel_windows.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ else
1818
export GEANT4_USE_OPENGL_X11=OFF
1919
export GEANT4_USE_QT_QT6=ON
2020
conda install conda-forge::qt6-main conda-forge::qt6-3d
21+
export QT_PLUGIN_DIR=$(qtpaths6 --plugin-dir)
22+
echo "QT_PLUGIN_DIR is $QT_PLUGIN_DIR"
2123
fi
2224

2325
conda list
@@ -69,8 +71,8 @@ source $HOME/software/geant4/bin/geant4make.sh
6971
export CMAKE_PREFIX_PATH=$HOME/software/geant4/bin:$HOME/software/itk/bin/:${CMAKE_PREFIX_PATH}
7072
cd core
7173
mkdir opengate_core/plugins
72-
cp -r /usr/local/miniconda/envs/opengate_core/lib/qt6/plugins/platforms/* opengate_core/plugins/
73-
cp -r /usr/local/miniconda/envs/opengate_core/lib/qt6/plugins/imageformats/* opengate_core/plugins/
74+
cp -r $QT_PLUGIN_DIR/platforms/* opengate_core/plugins/
75+
cp -r $QT_PLUGIN_DIR/imageformats/* opengate_core/plugins/
7476
if [[ ${MATRIX_PYTHON_VERSION} == "3.10" ]]; then
7577
export CIBW_BUILD="cp310-*"
7678
elif [[ ${MATRIX_PYTHON_VERSION} == "3.11" ]]; then

0 commit comments

Comments
 (0)