Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -66,6 +66,7 @@ jobs:
cd build
WHEEL_PATH=$(ls smoldyn*.whl)
python -m pip install --force-reinstall "${WHEEL_PATH}[biosimulators,biosimulators-tests]"

- name: Test BioSimulators
if: matrix.python-version >= '3.10'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/checkout@v2
- name: "Setup Python ${{ matrix.python-version }}"
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
if(NOT SMOLDYN_VERSION)
find_package(Git QUIET)
if(GIT_FOUND)
# Is the current commit tagged? If yes, this command will return the
# tag else it returns empty. When a tag is found, it is a release.
# Is the current commit tagged? If yes, following command
# will return the tag, empty otherwise.
execute_process(COMMAND ${GIT_EXECUTABLE} tag --points-at HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE SMOLDYN_TAG
Expand All @@ -28,9 +28,9 @@ if(NOT SMOLDYN_VERSION)
string(SUBSTRING ${SMOLDYN_TAG} 1 -1 SMOLDYN_VERSION)
message(STATUS " -- Found a release tag ${SMOLDYN_TAG}")
else()
# minute-ly release.
# hourly release.
string(TIMESTAMP STAMP "%Y%m%d%H%M")
set(SMOLDYN_VERSION "2.75.dev${STAMP}")
set(SMOLDYN_VERSION "2.76.dev${STAMP}")
endif()
endif()
endif()
Expand Down
5 changes: 3 additions & 2 deletions scripts/Dockerfile-BioSimulators
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-slim-bookworm
FROM python:3.10-slim-bullseye

ARG VERSION=""

Expand All @@ -14,7 +14,7 @@ LABEL \
org.opencontainers.image.vendor="Steven Andrews" \
org.opencontainers.image.licenses="LGPL-3.0-only" \
\
base_image="python:3.9-slim-bookworm" \
base_image="python:3.10-slim-bullseye" \
version="${VERSION}" \
software="Smoldyn" \
software.version="${VERSION}" \
Expand Down Expand Up @@ -44,6 +44,7 @@ ENV XVFB_RES="${RESOLUTION}" \
XVFB_ARGS="${XARGS}"

# install Smoldyn and its dependencies
RUN ls -ltr
COPY smoldyn*.whl /tmp/
RUN cd /tmp \
&& WHEEL_PATH=$(ls -1 smoldyn*.whl | head -n 1) \
Expand Down
8 changes: 4 additions & 4 deletions scripts/build_wheels_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ echo "Path to store wheels : $WHEELHOUSE"
rm -rf "$WHEELHOUSE" && mkdir -p "$WHEELHOUSE"

PYDIR310=/opt/python/cp310-cp310/
PYDIR311=/opt/python/cp311-cp311/
PYDIR312=/opt/python/cp312-cp312/
PYDIR313=/opt/python/cp313-cp313/

for PYDIR in $PYDIR313 $PYDIR312 $PYDIR311 $PYDIR310; do
# all python3 version can use this wheel.
for PYDIR in $PYDIR310; do
PYTHON=$PYDIR/bin/python

# dependencies
Expand All @@ -36,6 +34,8 @@ for PYDIR in $PYDIR313 $PYDIR312 $PYDIR311 $PYDIR310; do
make wheel
export PYTHONPATH="$(pwd)/py"
$PYTHON -m smoldyn "$SCRIPT_DIR/../examples/S4_molecules/mollist.txt"

$PYTHON -m auditwheel show *.whl
$PYTHON -m auditwheel repair *.whl -w "$WHEELHOUSE"

# install and test it
Expand Down
2 changes: 1 addition & 1 deletion source/python/pyproject.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "smoldyn"
version = "@SMOLDYN_VERSION@"
readme = "../README.md"
requires-python = ">=3.9"
requires-python = ">=3.10"
authors = [
{name = "Steve Andrews", email = "steve.andrews@epcc.ed.ac.uk"},
{name = "Dilawar Singh", email = "dilawar.s.rajput@gmail.com"}
Expand Down
Loading