Skip to content

Commit 42b55a5

Browse files
committed
Try just major/minor version
1 parent bc078d0 commit 42b55a5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

dev/conda/conda-build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ log "CONDA_PLATFORM: $CONDA_PLATFORM ${*}"
5959
source $SWIFT_T_TOP/dev/get-versions.sh
6060
export SWIFT_T_VERSION
6161
log "SWIFT/T VERSION: $SWIFT_T_VERSION"
62-
# Sets PYTHON_VERSION: passed into meta.yaml:
62+
# Setenvs PYTHON_VERSION: passed into meta.yaml: e.g. "3.12.11"
6363
source $DEV_CONDA/get-python-version.sh
64+
# Python version, just major.minor: e.g. "3.12"
65+
export PYTHON_VERSION_MM=${PYTHON_VERSION_MM%.*}
6466
# Optionally set R_VERSION from user argument:
6567
if (( ${#R} )) export R_VERSION=${R[2]}
6668

dev/conda/meta-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ m4_ifelse(m4_getenv(USE_TK), `1',m4_include(pkgs-tk.yaml))m4_dnl
4646
m4_ifelse(m4_getenv(USE_ZSH), `1',m4_include(pkgs-zsh.yaml))m4_dnl
4747
m4_ifelse(m4_getenv(ENABLE_R), `1',m4_include(pkgs-R.yaml))m4_dnl
4848
run:
49-
- python==m4_getenv(PYTHON_VERSION)
49+
- python==m4_getenv(PYTHON_VERSION_MM)
5050
- openjdk>=17
5151
- m4_getenv(SPEC_MPICH)
5252
- swig

0 commit comments

Comments
 (0)