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

[DO NOT MERGE] Py3.13 tests #45

Open
wants to merge 58 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
7286aed
initial fix with ruff
alexmgoldberg Jan 18, 2024
cc2a358
true NPY201 fixes
jeremyleung521 Jan 19, 2024
dfe572d
remove ruff lines
jeremyleung521 Jan 19, 2024
80aae91
Merge pull request #1 from jeremyleung521/numpy2
alexmgoldberg Jan 19, 2024
0432f4e
initial fix with ruff
alexmgoldberg Jan 18, 2024
1aee1c3
true NPY201 fixes
jeremyleung521 Jan 19, 2024
8e657af
remove ruff lines
jeremyleung521 Jan 19, 2024
7543537
Merge branch 'develop' of ssh://github.com/westpa/westpa into numpy2
jeremyleung521 Apr 5, 2024
f2c8f18
some changes to the cython code for numpy 2
jeremyleung521 Apr 5, 2024
21b7f1d
bump minimum version for dependencies
jeremyleung521 Apr 5, 2024
c50e8f7
Merge branch 'numpy2' of github.com:jeremyleung521/westpa into numpy2
jeremyleung521 Sep 4, 2024
d68fbbd
Merge branch 'develop' of github.com:jeremyleung521/westpa into numpy2
jeremyleung521 Sep 4, 2024
7d78590
not in h5diff.py
jeremyleung521 Sep 4, 2024
7e90af7
pin to numpy2, <3
jeremyleung521 Sep 4, 2024
bbd018a
drop python 3.8, bump to 3.12
jeremyleung521 Sep 4, 2024
1342939
test py3.13
jeremyleung521 Oct 14, 2024
031ca9d
drop python 3.8, EOL
jeremyleung521 Oct 14, 2024
82f12c1
Update cibuildwheel version
jeremyleung521 Oct 14, 2024
58ab55e
allow rerun for w_fluxanl test
jeremyleung521 Oct 14, 2024
b205b1d
pull drop-py3.8 commits
jeremyleung521 Oct 14, 2024
ca04d8f
Merge branch 'develop' into py3.13
jeremyleung521 Oct 14, 2024
946ea86
Merge branch 'develop' into numpy2
jeremyleung521 Oct 14, 2024
a3140b9
Merge branch 'develop' of ssh://github.com/westpa/westpa into numpy2
jeremyleung521 Dec 11, 2024
b125317
update westpa dependencies for numpy2
jeremyleung521 Dec 11, 2024
b8b29a5
pin numpy versions correctly
jeremyleung521 Dec 12, 2024
6fd3be2
Merge branch 'develop' of ssh://github.com/westpa/westpa into numpy2
jeremyleung521 Dec 12, 2024
4941e97
remove np.msort
jeremyleung521 Dec 12, 2024
d9559a8
cpdef is probably more appropriate
jeremyleung521 Dec 12, 2024
58b06d6
Merge branch 'develop' of ssh://github.com/westpa/westpa into numpy2
jeremyleung521 Dec 12, 2024
822f11a
drop py<= 3.8 support, hopefully allow numpy2 testing?
jeremyleung521 Dec 12, 2024
9bc590a
print conda env before moving on in testing
jeremyleung521 Dec 12, 2024
51b72b1
update ref file for numpy2
jeremyleung521 Dec 12, 2024
01c0ba2
Revert "update ref file for numpy2"
jeremyleung521 Dec 12, 2024
fb86e43
fix numpy str/repr changes in numpy2
jeremyleung521 Jan 9, 2025
e5d847e
use tmp_path instead of tmp_dir
jeremyleung521 Jan 9, 2025
65f539b
for some reason the fixtures folder is not recognized locally by pyte…
jeremyleung521 Jan 9, 2025
b0dc47b
fix fixtures folder
jeremyleung521 Jan 10, 2025
ec34da3
readability first for output
jeremyleung521 Jan 16, 2025
6dd5d8f
can't set to -1 if it's unsigned int
jeremyleung521 Jan 16, 2025
6afd220
let's see if these new files solve the mab tests
jeremyleung521 Jan 16, 2025
2ec8300
Revert "let's see if these new files solve the mab tests"
jeremyleung521 Jan 16, 2025
af491cc
do stable argsort for mab
jeremyleung521 Jan 22, 2025
f80dd0f
use np.trapezoid instead of np.trapz due to deprecation
jeremyleung521 Jan 22, 2025
d899fc3
force stable sorting everywhere
jeremyleung521 Jan 22, 2025
df855a9
test on numpy1 and numpy2
jeremyleung521 Jan 22, 2025
9a8a06f
build bin label by hand.
jeremyleung521 Feb 10, 2025
e0257f6
Merge branch 'develop' of ssh://github.com/westpa/westpa into py3.13
jeremyleung521 Feb 10, 2025
08849d3
pull squashed numpy2 commits.
jeremyleung521 Feb 10, 2025
e7293a8
clean up leftovers
jeremyleung521 Feb 10, 2025
927f247
cleanup numpy2 things
jeremyleung521 Feb 10, 2025
5410b98
exclude testing numpy1 with py3.13
jeremyleung521 Feb 10, 2025
c410c96
indent exclude correctly
jeremyleung521 Feb 10, 2025
602c934
update doc to reference to min py>=3.9
jeremyleung521 Feb 10, 2025
6a27046
remove setup.cfg and move to pyproject.toml
jeremyleung521 Feb 10, 2025
ba3da14
Merge branch 'develop' into py3.13
jeremyleung521 Feb 12, 2025
09aba07
Py39 numpy1 build fix (#470)
jeremyleung521 Feb 12, 2025
0eb8b25
Merge branch 'develop' of ssh://github.com/westpa/westpa into py3.13
jeremyleung521 Feb 12, 2025
400115d
Merge branch 'py3.13' of ssh://github.com/jeremyleung521/westpa into …
jeremyleung521 Feb 12, 2025
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/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-13", "macos-latest"] # macos-13 is x86_64, macos-latest is arm64
python-version: [9, 10, 11, 12] # sub-versions of Python
python-version: [9, 10, 11, 12, 13] # sub-versions of Python
steps:
- uses: actions/checkout@v4

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-13", "macos-latest"] # macos-13 is x86-64, macos-latest is arm64
python-version: ["3.9", "3.10", "3.11", "3.12"]
numpy-version: ['1', '2']
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
numpy-version: ["1", "2"]
exclude:
- python-version: "3.9"
numpy-version: "2"
- python-version: "3.13"
numpy-version: "1"

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ WESTPA is free software, licensed under the terms of the MIT License. See the fi
Requirements
------------

WESTPA is written in Python and requires version 3.7 or later. WESTPA also requires a number of Python scientific software packages.
WESTPA is written in Python and requires version 3.9 or later. WESTPA also requires a number of Python scientific software packages.
The simplest way to meet these requirements is to download the
Anaconda Python distribution from www.anaconda.com (free for all users).

Expand Down Expand Up @@ -94,7 +94,7 @@ See the install instructions on our `wiki`_ for more detailed information.

To install from source (**not recommended**), start by downloading the corresponding tar.gz file from the `releases page`_. After downloading the file, unpack the file and install WESTPA by executing the following::

tar xvzf westpa-2022.09.tar.gz
tar xvzf westpa-2022.11.tar.gz
cd westpa
python -m pip install -e .

Expand Down
6 changes: 3 additions & 3 deletions doc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ WESTPA is free software, licensed under the terms of the MIT License. See the fi
Requirements
------------

WESTPA is written in Python and requires version 3.7 or later. WESTPA further
WESTPA is written in Python and requires version 3.9 or later. WESTPA further
requires a large number of scientific software libraries for Python and other
languages. The simplest way to meet these requirements is to download the
Anaconda Python distribution from www.continuum.io (free for all users).
Expand All @@ -51,7 +51,7 @@ WESTPA is developed and tested on Unix-like operating systems, including Linux a

Regardless of the chosen method of installation, before installing WESTPA, we recommend you to first install the Python 3 version provided by the latest free `Anaconda Python distribution`_. After installing Anaconda, create a new python environment for the WESTPA install with the following::

conda create -n westpa-2.0 python=3.9
conda create -n westpa-2.0 python=3.11
conda activate westpa-2.0

Then, we recommend installing WESTPA through conda or pip. Execute either of the following::
Expand All @@ -67,7 +67,7 @@ See the install instructions on our `wiki`_ for more detailed information.

To install from source (**not recommended**), start by downloading the corresponding tar.gz file from the `releases page`_. After downloading the file, unpack the file and install WESTPA by executing the following::

tar xvzf westpa-main.tar.gz
tar xvzf westpa-2022.11.tar.gz
cd westpa
python -m pip install -e .

Expand Down
15 changes: 14 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ requires = [
"wheel",
"Cython >=0.29.16; python_version >='3.10'", # Note: sync with setup.py
"Cython <3.0.3, >=0.29.16; python_version <'3.10'",
"numpy >=2.0.0, <3", # Force numpy>=2 during build time so it works on both 1.XX and 2.XX
"numpy >=2.0.0, <3; python_version >='3.10'", # Force numpy>=2 during build time so it works on both 1.XX and 2.XX
"numpy < 2.0.0; python_version <'3.10'", # Numpy 2 builds break PyTables in python 3.9
"scipy >=0.19.1",
"versioneer-518"
]
Expand Down Expand Up @@ -45,3 +46,15 @@ exclude = '''
)
'''

# See the docstring in versioneer.py for instructions. Note that you must
# re-run 'versioneer.py setup' after changing this section, and commit the
# resulting files.

[tool.versioneer]
VCS = "git"
style = "pep440"
versionfile_source = "src/westpa/_version.py"
versionfile_build = "westpa/_version.py"
tag_prefix = "v"
parentdir_prefix = "westpa-"

13 changes: 0 additions & 13 deletions setup.cfg

This file was deleted.

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ def extensions():
]

INSTALL_REQUIRES = [
"numpy >= 1.25, <3",
"numpy >= 1.25.0, <3; python_version >='3.10'",
"numpy >= 1.25.0, <2; python_version <'3.10'", # pytables is broken for numpy2/py3.9
"scipy >= 0.19.1",
"h5py >= 2.10",
"mdtraj >= 1.9.5",
Expand Down