Skip to content

Commit 1414320

Browse files
authored
chore: enable build for python 3.14 (#152)
* enable 3.14 wheels * Building using python3.10 * tweaks to dev version strings * use python3.10 in biosimulator images * use debian bulleyes as base image for biosimulator
1 parent b691c2d commit 1414320

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
python-version: ["3.10", "3.11", "3.12", "3.13"]
10+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1111

1212
steps:
1313
- uses: actions/checkout@v2
@@ -66,6 +66,7 @@ jobs:
6666
cd build
6767
WHEEL_PATH=$(ls smoldyn*.whl)
6868
python -m pip install --force-reinstall "${WHEEL_PATH}[biosimulators,biosimulators-tests]"
69+
6970
- name: Test BioSimulators
7071
if: matrix.python-version >= '3.10'
7172
run: |

.github/workflows/osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: macos-latest
1616
strategy:
1717
matrix:
18-
python-version: ["3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1919

2020
steps:
2121
- uses: actions/checkout@v2

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: windows-latest
1616
strategy:
1717
matrix:
18-
python-version: ["3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: "Setup Python ${{ matrix.python-version }}"

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
1717
if(NOT SMOLDYN_VERSION)
1818
find_package(Git QUIET)
1919
if(GIT_FOUND)
20-
# Is the current commit tagged? If yes, this command will return the
21-
# tag else it returns empty. When a tag is found, it is a release.
20+
# Is the current commit tagged? If yes, following command
21+
# will return the tag, empty otherwise.
2222
execute_process(COMMAND ${GIT_EXECUTABLE} tag --points-at HEAD
2323
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
2424
OUTPUT_VARIABLE SMOLDYN_TAG
@@ -28,9 +28,9 @@ if(NOT SMOLDYN_VERSION)
2828
string(SUBSTRING ${SMOLDYN_TAG} 1 -1 SMOLDYN_VERSION)
2929
message(STATUS " -- Found a release tag ${SMOLDYN_TAG}")
3030
else()
31-
# minute-ly release.
31+
# hourly release.
3232
string(TIMESTAMP STAMP "%Y%m%d%H%M")
33-
set(SMOLDYN_VERSION "2.75.dev${STAMP}")
33+
set(SMOLDYN_VERSION "2.76.dev${STAMP}")
3434
endif()
3535
endif()
3636
endif()

scripts/Dockerfile-BioSimulators

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.9-slim-bookworm
1+
FROM python:3.10-slim-bullseye
22

33
ARG VERSION=""
44

@@ -14,7 +14,7 @@ LABEL \
1414
org.opencontainers.image.vendor="Steven Andrews" \
1515
org.opencontainers.image.licenses="LGPL-3.0-only" \
1616
\
17-
base_image="python:3.9-slim-bookworm" \
17+
base_image="python:3.10-slim-bullseye" \
1818
version="${VERSION}" \
1919
software="Smoldyn" \
2020
software.version="${VERSION}" \
@@ -44,6 +44,7 @@ ENV XVFB_RES="${RESOLUTION}" \
4444
XVFB_ARGS="${XARGS}"
4545

4646
# install Smoldyn and its dependencies
47+
RUN ls -ltr
4748
COPY smoldyn*.whl /tmp/
4849
RUN cd /tmp \
4950
&& WHEEL_PATH=$(ls -1 smoldyn*.whl | head -n 1) \

scripts/build_wheels_linux.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ echo "Path to store wheels : $WHEELHOUSE"
1010
rm -rf "$WHEELHOUSE" && mkdir -p "$WHEELHOUSE"
1111

1212
PYDIR310=/opt/python/cp310-cp310/
13-
PYDIR311=/opt/python/cp311-cp311/
14-
PYDIR312=/opt/python/cp312-cp312/
15-
PYDIR313=/opt/python/cp313-cp313/
1613

17-
for PYDIR in $PYDIR313 $PYDIR312 $PYDIR311 $PYDIR310; do
14+
# all python3 version can use this wheel.
15+
for PYDIR in $PYDIR310; do
1816
PYTHON=$PYDIR/bin/python
1917

2018
# dependencies
@@ -36,6 +34,8 @@ for PYDIR in $PYDIR313 $PYDIR312 $PYDIR311 $PYDIR310; do
3634
make wheel
3735
export PYTHONPATH="$(pwd)/py"
3836
$PYTHON -m smoldyn "$SCRIPT_DIR/../examples/S4_molecules/mollist.txt"
37+
38+
$PYTHON -m auditwheel show *.whl
3939
$PYTHON -m auditwheel repair *.whl -w "$WHEELHOUSE"
4040

4141
# install and test it

source/python/pyproject.toml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "smoldyn"
33
version = "@SMOLDYN_VERSION@"
44
readme = "../README.md"
5-
requires-python = ">=3.9"
5+
requires-python = ">=3.10"
66
authors = [
77
{name = "Steve Andrews", email = "[email protected]"},
88
{name = "Dilawar Singh", email = "[email protected]"}

0 commit comments

Comments
 (0)