Skip to content

Commit

Permalink
Merge branch 'master' into 347-docs-clarification-relating-to-matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
orbeckst authored Apr 1, 2024
2 parents f44fcb5 + 160a012 commit 4cd06f6
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11"]
# Only test lowest and highest version on the expensive/slow
# macOS and windows runners (UPDATE when supported versions change):
exclude:
Expand All @@ -50,7 +50,7 @@ jobs:
with:
environment-file: devtools/conda-envs/test_env.yaml
environment-name: test
extra-specs: |
create-args: |
python=${{ matrix.python-version }}
- name: Install package (with no dependencies)
Expand Down
9 changes: 9 additions & 0 deletions docs/requirements.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: docs
channels:
dependencies:
# Base depends
- python=3.10
- pip
# Doc
- sphinx
- sphinx_rtd_theme
2 changes: 1 addition & 1 deletion readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build:
python: "mambaforge-4.10"

conda:
environment: devtools/conda-envs/test_env.yaml
environment: docs/requirements.yaml

python:
install:
Expand Down
1 change: 1 addition & 0 deletions src/alchemlyb/tests/parsing/test_amber.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Amber parser tests.
"""

import bz2
import logging

Expand Down
2 changes: 2 additions & 0 deletions src/alchemlyb/tests/parsing/test_namd.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""NAMD parser tests.
"""

import bz2
from os.path import basename
from re import search
Expand All @@ -13,6 +14,7 @@

from alchemlyb.parsing.namd import extract_u_nk, extract


# Indices of lambda values in the following line in NAMD fepout files:
# #NEW FEP WINDOW: LAMBDA SET TO 0.6 LAMBDA2 0.7 LAMBDA_IDWS 0.5
LAMBDA1_IDX_NEW = 6
Expand Down
1 change: 1 addition & 0 deletions src/alchemlyb/tests/test_fep_estimators.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Tests for all FEP-based estimators in ``alchemlyb``.
"""

import pytest

import alchemlyb
Expand Down
1 change: 1 addition & 0 deletions src/alchemlyb/tests/test_preprocessing.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Tests for preprocessing functions.
"""

import logging

import numpy as np
Expand Down
1 change: 1 addition & 0 deletions src/alchemlyb/tests/test_ti_estimators.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Tests for all TI-based estimators in ``alchemlyb``.
"""

import pandas as pd
import pytest

Expand Down
1 change: 1 addition & 0 deletions src/alchemlyb/tests/test_ti_gaussian_quadrature.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Tests for all TI-based estimators in ``alchemlyb``.
"""

import pandas as pd
import numpy as np
import copy
Expand Down
4 changes: 2 additions & 2 deletions src/alchemlyb/tests/test_workflow_ABFE.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ def workflow(tmp_path_factory):


class TestInit:
def test_nofilematch(self):
def test_nofilematch(self, tmp_path):
with pytest.raises(ValueError, match="No file has been matched to"):
ABFE(
dir="./",
dir=str(tmp_path),
prefix="dhdl",
suffix="xvg",
T=310,
Expand Down

0 comments on commit 4cd06f6

Please sign in to comment.