Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Python 3.12 #526

Merged
merged 8 commits into from
Mar 21, 2024
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
11 changes: 7 additions & 4 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
python-version: [3.8, 3.11] # Check against oldest and newest versions
python-version: ["3.8", "3.11", "3.12"] # Check against oldest and newest versions
jax: ["", "_jax"]
exclude: # Skip win + jax
- jax: "_jax"
Expand All @@ -45,12 +45,15 @@ jobs:
ulimit -a

- name: Setup Conda via Mamba
uses: mamba-org/provision-with-micromamba@main
uses: mamba-org/setup-micromamba@v1
with:
environment-file: devtools/conda-envs/test_env${{ matrix.jax }}.yaml
environment-name: test
channels: conda-forge,defaults
extra-specs: |
condarc: |
channels:
- conda-forge
- defaults
create-args: >-
python=${{ matrix.python-version }}

- name: Install package
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,5 @@ docs/pymbar-docs
docs/_build
tools/hash_dict.pickle
docs/examples/generated/

.DS_Store
1 change: 1 addition & 0 deletions examples/heat-capacity/heat-capacity.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
todo -- simplify the total energy read in, the kinetic energy read-in, temperature read-in
"""

# =========================================================
# IMPORTS
# =========================================================
Expand Down
8 changes: 4 additions & 4 deletions pymbar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
from .other_estimators import bar, bar_overlap, bar_zero, exp, exp_gauss
from .fes import FES

from ._version import get_versions

__version__ = get_versions()["version"]
del get_versions

__all__ = [
"exp",
Expand All @@ -51,3 +47,7 @@
"utils",
"FES",
]

from . import _version

__version__ = _version.get_versions()["version"]
Loading
Loading