Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
5bd32dd
Add placeholder to CHANGELOG.
lohedges Nov 10, 2025
4bbbd3b
Update development version.
lohedges Nov 10, 2025
25e6c27
Use "0" for null EMLE interpolation force expression. [closes #383]
lohedges Nov 25, 2025
73005d2
Fix delta parameter in soft-core Coulomb term. [closes #385]
lohedges Nov 25, 2025
8fb9dc8
Fix delta parameter in ghost_14ff. [ci skip]
lohedges Nov 26, 2025
908a6a6
Merge pull request #384 from OpenBioSim/fix_383
lohedges Nov 28, 2025
dd366e0
Use SOMD2 logger for dynamics warnings.
lohedges Dec 2, 2025
d3a0e2c
Merge pull request #387 from OpenBioSim/feature_somd2_logger
lohedges Dec 2, 2025
4ee8dc9
Fix recursion bug in sire.base.wrap. [closes #388]
lohedges Dec 3, 2025
a4ac0be
Merge pull request #389 from OpenBioSim/fix_388
lohedges Dec 3, 2025
ac2408f
Add support for passing cell vectors to EMLE.
lohedges Dec 10, 2025
37959c0
Add --install-metadata option to register Sire package with conda.
lohedges Dec 16, 2025
8e2c34a
Fix get_rest2_scale method. [closes #391]
lohedges Jan 7, 2026
3af402d
Merge pull request #393 from OpenBioSim/fix_391
lohedges Jan 8, 2026
47501b7
Merge branch 'devel' into feature_cell
lohedges Jan 12, 2026
567eecf
Try to fix Windows CI CXX environment variable issue.
lohedges Jan 12, 2026
d94a7c2
Fix docstring for swap_end_states option. [ci skip]
lohedges Jan 12, 2026
f5da21f
Fix callback signature.
lohedges Jan 12, 2026
ad4ef13
Merge pull request #395 from OpenBioSim/feature_cell
lohedges Jan 12, 2026
52402fb
Don't set CC and CXX environment variables on Windows.
lohedges Jan 13, 2026
e116413
Update Morse restraint functionality to support automatic parametrisa…
akalpokas Feb 2, 2026
3ee47c9
Update changelog entry
akalpokas Feb 2, 2026
8846e54
Merge pull request #397 from akalpokas/feature_alchemical_restraints_2
lohedges Feb 3, 2026
6f9b9e5
Blacken. [ci skip]
lohedges Feb 3, 2026
dea7676
Switch to pixi and rattler build.
lohedges Feb 4, 2026
660bceb
Disable broken SireGemmi build.
lohedges Feb 5, 2026
ad41c02
Install anaconda-client.
lohedges Feb 5, 2026
ab25767
OpenMM needs a newer sysroot for source builds (when we are host)
lohedges Feb 5, 2026
5a1be9a
Update CHANGELOG.
lohedges Feb 5, 2026
5c9d04a
Don't use NamedTemporaryFile since it's broken on Windows.
lohedges Feb 5, 2026
a84d50c
Blacken.
lohedges Feb 5, 2026
77dee9a
Add all downstream OpenBioSim dependencies.
lohedges Feb 5, 2026
c87063b
Add compilers as host depdendency and comment OBS requirements.
lohedges Feb 6, 2026
1cdd89d
Fix linux-aarch64 dependency resolution issues.
lohedges Feb 6, 2026
28cdb27
Simplify build output naming scheme.
lohedges Feb 6, 2026
cbad1e8
Switch from project to workspace.
lohedges Feb 6, 2026
26d64c6
Add support for pixi shell startup script. [ci skip]
lohedges Feb 6, 2026
ba8f3db
Formatting tweak. [ci skip]
lohedges Feb 6, 2026
0f24e97
Add black to development environment. [ci skip]
lohedges Feb 6, 2026
da7e55f
Merge pull request #398 from OpenBioSim/feature_rattler
lohedges Feb 9, 2026
328ce71
Fix version and build number handling.
lohedges Feb 9, 2026
c1815ab
Blacken. [ci skip]
lohedges Feb 9, 2026
47f72e0
Use fetch-depth of 0 to get tags.
lohedges Feb 9, 2026
640b944
Add linting tools to dev environment. [ci skip]
lohedges Feb 11, 2026
0bfa154
Add rattler-build to development environment. [ci skip]
lohedges Feb 11, 2026
e48a67a
Use pix install of rattler-build. [ci skip]
lohedges Feb 11, 2026
e79f9b5
Fix loch dependencies. [ci skip]
lohedges Feb 12, 2026
07b5820
nvidia-ml-py is noarch. [ci skip]
lohedges Feb 12, 2026
0c34580
Remove transitive dependencies pulled in by OpenMM. [ci skip]
lohedges Feb 13, 2026
561fe74
Add note regarding OpenCL activation. [ci skip]
lohedges Feb 13, 2026
8e30345
Exclude files from /etc/OpenCL package.
lohedges Feb 13, 2026
77c54e3
Remove redundant depdendency. [ci skip]
lohedges Feb 13, 2026
161bab8
Update OpenCL activation instructions. [ci skip]
lohedges Feb 15, 2026
55d9e67
Remove redundant comments and pins. [ci skip]
lohedges Feb 16, 2026
36aa1ee
Can now run macOS Python 3.12 build.
lohedges Feb 16, 2026
491229e
Merge branch 'main' into release_2025.4.0
lohedges Feb 16, 2026
d7dbf5f
Update version.
lohedges Feb 16, 2026
38a9a75
Update CHANGELOG.
lohedges Feb 16, 2026
76f190b
Update EnvironmentError message. [ci skip]
lohedges Feb 16, 2026
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
53 changes: 29 additions & 24 deletions .github/workflows/choose_branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Release Branch

# Note that push and pull-request builds are automatically
# now skipped by GitHub if
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.

on:
workflow_dispatch:
Expand Down Expand Up @@ -31,11 +31,11 @@ jobs:
- platform:
{ name: "macos", os: "macos-latest", shell: "bash -l {0}" }
python-version: "3.10"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
python-version: "3.10"
- platform:
{ name: "macos", os: "macos-latest", shell: "bash -l {0}" }
python-version: "3.12" # MacOS can't run 3.12 yet...
python-version: "3.11"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
python-version: "3.10"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
python-version: "3.11"
environment:
Expand All @@ -50,31 +50,36 @@ jobs:
REPO: "${{ github.repository }}"
steps:
#
- uses: conda-incubator/setup-miniconda@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch }}
fetch-depth: 0
#
- name: Install pixi
uses: prefix-dev/setup-pixi@v0.9.4
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
activate-environment: sire_build
miniforge-version: latest
run-install: false
#
- name: Clone the desired branch
run: git clone https://github.com/${{ env.REPO }} -b ${{ github.event.inputs.branch }} sire
- name: Install rattler-build
shell: bash
run: pixi global install rattler-build
#
- name: Setup Conda
run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser
- name: Generate recipe
run: python ${{ github.workspace }}/actions/generate_recipe.py --features obs emle
#
- name: Update Conda recipe
run: python ${{ github.workspace }}/sire/actions/update_recipe.py
- name: Write Python variant config
shell: bash
run: printf 'python:\n - "${{ matrix.python-version }}"\n' > "${{ github.workspace }}/python_variant.yaml"
#
- name: Prepare build location
run: mkdir ${{ github.workspace }}/build
- name: Build package using rattler-build
shell: bash
run: rattler-build build --recipe "${{ github.workspace }}/recipes/sire" -c conda-forge -c openbiosim/label/dev --variant-config "${{ github.workspace }}/python_variant.yaml"
#
- name: Build Conda package using conda build
run: conda build -c conda-forge -c openbiosim/label/dev ${{ github.workspace }}/sire/recipes/sire
- name: Install anaconda-client
run: python -m pip install anaconda-client
#
- name: Upload Conda package
# Maybe add the logic here that this is a dev package?
run: python ${{ github.workspace }}/sire/actions/upload_package.py
- name: Upload package
run: python ${{ github.workspace }}/actions/upload_package.py
env:
SRC_DIR: ${{ github.workspace }}/sire
SRC_DIR: ${{ github.workspace }}
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
51 changes: 29 additions & 22 deletions .github/workflows/devel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Release Devel

# Note that push and pull-request builds are automatically
# now skipped by GitHub if
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.

on:
workflow_dispatch:
Expand All @@ -28,7 +28,10 @@ jobs:
# but Linux
- platform:
{ name: "macos", os: "macos-latest", shell: "bash -l {0}" }
python-version: "3.12" # MacOS can't run 3.12 yet... We want 3.10 and 3.11
python-version: "3.10"
- platform:
{ name: "macos", os: "macos-latest", shell: "bash -l {0}" }
python-version: "3.11"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
python-version: "3.10"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
Expand All @@ -45,31 +48,35 @@ jobs:
REPO: "${{ github.repository }}"
steps:
#
- uses: conda-incubator/setup-miniconda@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
#
- name: Install pixi
uses: prefix-dev/setup-pixi@v0.9.4
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
activate-environment: sire_build
miniforge-version: latest
run-install: false
#
- name: Clone the devel branch (push to devel)
run: git clone https://github.com/${{ env.REPO }} sire
- name: Install rattler-build
shell: bash
run: pixi global install rattler-build
#
- name: Setup Conda
run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser
- name: Generate recipe
run: python ${{ github.workspace }}/actions/generate_recipe.py --features obs emle
#
- name: Update Conda recipe
run: python ${{ github.workspace }}/sire/actions/update_recipe.py
- name: Write Python variant config
shell: bash
run: printf 'python:\n - "${{ matrix.python-version }}"\n' > "${{ github.workspace }}/python_variant.yaml"
#
- name: Prepare build location
run: mkdir ${{ github.workspace }}/build
- name: Build package using rattler-build
shell: bash
run: rattler-build build --recipe "${{ github.workspace }}/recipes/sire" -c conda-forge -c openbiosim/label/dev --variant-config "${{ github.workspace }}/python_variant.yaml"
#
- name: Build Conda package using conda build
run: conda build -c conda-forge -c openbiosim/label/dev ${{ github.workspace }}/sire/recipes/sire
- name: Install anaconda-client
run: python -m pip install anaconda-client
#
- name: Upload Conda package
# Maybe add the logic here that this is a dev package?
run: python ${{ github.workspace }}/sire/actions/upload_package.py
- name: Upload package
run: python ${{ github.workspace }}/actions/upload_package.py
env:
SRC_DIR: ${{ github.workspace }}/sire
SRC_DIR: ${{ github.workspace }}
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
52 changes: 28 additions & 24 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Release Main

# Note that push and pull-request builds are automatically
# now skipped by GitHub if
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.

# Only allow this action to run on a manual run.
# We should specify when run whether or not we want
Expand All @@ -29,10 +29,7 @@ jobs:
- { name: "windows", os: "windows-latest", shell: "pwsh" }
- { name: "linux", os: "ubuntu-latest", shell: "bash -l {0}" }
- { name: "macos", os: "macos-latest", shell: "bash -l {0}" }
exclude:
- platform:
{ name: "macos", os: "macos-latest", shell: "bash -l {0}" }
python-version: "3.12" # MacOS can't run 3.12 yet...
# No exclusions - release builds all combinations
environment:
name: sire-build
defaults:
Expand All @@ -45,32 +42,39 @@ jobs:
REPO: "${{ github.event.pull_request.head.repo.full_name || github.repository }}"
steps:
#
- uses: conda-incubator/setup-miniconda@v3
- uses: actions/checkout@v4
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
activate-environment: sire_build
miniforge-version: latest
ref: main
fetch-depth: 0
#
- name: Clone the main branch (push to main)
run: git clone -b main https://github.com/openbiosim/sire sire
- name: Install pixi
uses: prefix-dev/setup-pixi@v0.9.4
with:
run-install: false
#
- name: Install rattler-build
shell: bash
run: pixi global install rattler-build
#
- name: Setup Conda
run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser
- name: Generate recipe
run: python ${{ github.workspace }}/actions/generate_recipe.py --features obs emle
#
- name: Update Conda recipe
run: python ${{ github.workspace }}/sire/actions/update_recipe.py
- name: Write Python variant config
shell: bash
run: printf 'python:\n - "${{ matrix.python-version }}"\n' > "${{ github.workspace }}/python_variant.yaml"
#
- name: Prepare build location
run: mkdir ${{ github.workspace }}/build
- name: Build package using rattler-build
shell: bash
run: rattler-build build --recipe "${{ github.workspace }}/recipes/sire" -c conda-forge -c openbiosim/label/dev --variant-config "${{ github.workspace }}/python_variant.yaml"
#
- name: Build Conda package using conda build
run: conda build -c conda-forge -c openbiosim/label/dev ${{ github.workspace }}/sire/recipes/sire
- name: Install anaconda-client
run: python -m pip install anaconda-client
if: github.event.inputs.upload_packages == 'yes'
#
- name: Upload Conda package
- name: Upload package
# upload to the 'test' channel
run: python ${{ github.workspace }}/sire/actions/upload_package.py test
run: python ${{ github.workspace }}/actions/upload_package.py test
env:
SRC_DIR: ${{ github.workspace }}/sire
SRC_DIR: ${{ github.workspace }}
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
if: github.event.inputs.upload_packages == 'yes'
42 changes: 22 additions & 20 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Pull-Request

# Note that push and pull-request builds are automatically
# now skipped by GitHub if
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.
# [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
# are in the commit message. We don't need to check for this ourselves.

on:
pull_request:
Expand All @@ -28,11 +28,11 @@ jobs:
- platform:
{ name: "macos", os: "macos-latest", shell: "bash -l {0}" }
python-version: "3.10"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
python-version: "3.10"
- platform:
{ name: "macos", os: "macos-latest", shell: "bash -l {0}" }
python-version: "3.12" # MacOS can't run 3.12 yet...
python-version: "3.11"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
python-version: "3.10"
- platform: { name: "windows", os: "windows-latest", shell: "pwsh" }
python-version: "3.11"
environment:
Expand All @@ -47,24 +47,26 @@ jobs:
REPO: "${{ github.event.pull_request.head.repo.full_name || github.repository }}"
steps:
#
- uses: conda-incubator/setup-miniconda@v3
- uses: actions/checkout@v4
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
activate-environment: sire_build
miniforge-version: latest
fetch-depth: 0
#
- name: Clone the feature branch (pull request to devel)
run: git clone -b ${{ github.head_ref }} --single-branch https://github.com/${{ env.REPO }} sire
- name: Install pixi
uses: prefix-dev/setup-pixi@v0.9.4
with:
run-install: false
#
- name: Setup Conda
run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser
- name: Install rattler-build
shell: bash
run: pixi global install rattler-build
#
- name: Update Conda recipe
run: python ${{ github.workspace }}/sire/actions/update_recipe.py
- name: Generate recipe
run: python ${{ github.workspace }}/actions/generate_recipe.py --features obs emle
#
- name: Prepare build location
run: mkdir ${{ github.workspace }}/build
- name: Write Python variant config
shell: bash
run: printf 'python:\n - "${{ matrix.python-version }}"\n' > "${{ github.workspace }}/python_variant.yaml"
#
- name: Build Conda package using conda build
run: conda build -c conda-forge -c openbiosim/label/dev ${{ github.workspace }}/sire/recipes/sire
- name: Build package using rattler-build
shell: bash
run: rattler-build build --recipe "${{ github.workspace }}/recipes/sire" -c conda-forge -c openbiosim/label/dev --variant-config "${{ github.workspace }}/python_variant.yaml"
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build/wrapper/*
build/module/*
build/downloads/*
recipes/sire/meta.yaml
#files for wrapper
# files for wrappers
module_info
active_headers.data
exposed_decl.pypp.txt
Expand Down Expand Up @@ -57,12 +57,15 @@ tests/cache/*
# Python autogenerated backup wrappers
*~

#Atom
# Atom
.idea

#VS Code
# VS Code
.vscode

.DS_Store

.coverage

# Pixi startup file
pixi.sh
Loading