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
2 changes: 1 addition & 1 deletion .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
pixi-env: ["py311", "py312", "py313", "py314"]
pixi-env: ["py310", "py311", "py312", "py313", "py314"]

steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
build:
os: ubuntu-20.04
tools:
python: "3.9"
python: "3.10"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
2 changes: 1 addition & 1 deletion .ruff.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
target-version = "py311"
target-version = "py310"
line-length = 90

[lint]
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
author = "Jelena Tosovic, Domagoj Fijan, Marko Jukic, Urban Bren"

# The full version, including alpha/beta/rc tags
version = "0.5.0"
release = "0.5.0"
version = "0.5.1"
release = "0.5.1"


# -- General configuration ---------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ PyMOL plugin installation

This guide provides detailed installation instructions for Linux, Mac,
and Windows users. We recommend using `conda` or `mamba` to create a new
environment with at least Python 3.9.
environment with at least Python 3.10.

Note that PyMOL which can be downloaded from the `PyMOL website
<https://pymol.org/2/>`_ comes with python 3.7 which is not supported by
WaterNetworkAnalysis or ConservedWaterSearch. For this reason users
will have to install `mamba/conda` and create a new environment with
python version greater or equal to 3.9 and install PyMOL in that environment.
python version greater or equal to 3.10 and install PyMOL in that environment.
The plugin has been tested with PyMOL version > 2.5.0.

Prerequisites
Expand All @@ -67,7 +67,7 @@ Installation Steps

.. code-block:: bash

conda create -n myenv python=3.9
conda create -n myenv python=3.10

Replace ``myenv`` with your preferred environment name.

Expand Down
1,477 changes: 1,456 additions & 21 deletions pixi.lock

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,17 @@ channels = ["conda-forge"]
platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]

[dependencies]
python = ">=3.11,<3.15"
python = ">=3.10,<3.15"
pip = "*"

[pypi-dependencies]
ConservedWaterSearch = ">=0.1.0"
MDAnalysis = ">=2.4.0"
numpy = ">=1.22"
scipy = ">=1.0.0"
ConservedWaterSearch = "*"
MDAnalysis = "*"
numpy = ">=2.0"
scipy = "*"

[feature.test.pypi-dependencies]
pytest = "*"
ConservedWaterSearch = "==0.5.1"
MDAnalysis = "==2.10.0"
numpy = "==2.4.1"
scipy = "==1.17.0"

[feature.lint.pypi-dependencies]
ruff = "*"
Expand All @@ -29,6 +25,9 @@ prek = "*"
[feature.build.pypi-dependencies]
build = "*"

[feature.py310.dependencies]
python = "3.10.*"

[feature.py311.dependencies]
python = "3.11.*"

Expand All @@ -42,6 +41,7 @@ python = "3.13.*"
python = "3.14.*"

[environments]
py310 = { features = ["py310", "test"] }
py311 = { features = ["py311", "test"] }
py312 = { features = ["py312", "test"] }
py313 = { features = ["py313", "test"] }
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.10",
]
requires-python = ">=3.11"
requires-python = ">=3.10"
dynamic = ["dependencies"]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ConservedWaterSearch==0.5.0
ConservedWaterSearch==0.5.1
MDAnalysis==2.10.0
numpy==2.4.1
scipy==1.17.0
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ConservedWaterSearch>=0.5.0
ConservedWaterSearch>=0.5.1
MDAnalysis>=2.4.0
numpy>=2.0.0
scipy>=1.0.0
Loading