Skip to content

Commit 8495605

Browse files
CalCravenrootdaico007chrisjonesBSU
authoredMay 1, 2024
Bump to python 3.12 (mosdef-hub#1180)
* tests for python 3.12 * update numpy in in env * python 3.12 requires protobuf 4 * add MacOS-13 along with macos-latest to test both arm and x86 mac --------- Co-authored-by: root <root@DESKTOP-FO53E26> Co-authored-by: Co Quach <43968221+daico007@users.noreply.github.com> Co-authored-by: Co Quach <daico007@gmail.com> Co-authored-by: chrisjonesBSU <chrisjones4@u.boisestate.edu> Co-authored-by: Chris Jones <50423140+chrisjonesBSU@users.noreply.github.com>
1 parent 5e302f2 commit 8495605

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed
 

‎.github/workflows/CI.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [macOS-latest, ubuntu-latest]
22-
python-version: ["3.9", "3.10", "3.11"]
21+
os: [macOS-latest, macOS-13, ubuntu-latest]
22+
python-version: ["3.9", "3.10", "3.11", "3.12"]
2323
include:
2424
- os: windows-latest
25-
python-version: "3.11"
25+
python-version: "3.12"
2626

2727
defaults:
2828
run:

‎environment-dev-win.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ dependencies:
1414
- mdtraj
1515
- networkx
1616
- nglview>=2.7
17-
- numpy=1.24.2
17+
- numpy=1.26.4
1818
- openbabel>=3.0.0
1919
- packmol=1!18.013
2020
- parmed>=3.4.3
2121
- pip
2222
- pre-commit
23-
- protobuf<4
23+
- protobuf
2424
- py3Dmol
2525
- pycifrw
2626
- pytest

‎environment-dev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ dependencies:
1515
- mdtraj
1616
- networkx
1717
- nglview>=3
18-
- numpy=1.24.2
18+
- numpy=1.26.4
1919
- openbabel>=3
2020
- packmol>=20
2121
- parmed>=3.4.3
2222
- pip
2323
- pre-commit
24-
- protobuf<4
24+
- protobuf
2525
- py3Dmol
2626
- pycifrw
2727
- pytest

‎environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- ele
6-
- numpy=1.24.2
6+
- numpy=1.26.4
77
- packmol>=18
88
- gmso>=0.9.0
99
- parmed>=3.4.3

‎mbuild/tests/test_packing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ def test_box_edge(self, h2o, methane):
397397
edge = 0.2
398398
bounds = [2, 2, 2, 1]
399399
sphere = mb.fill_sphere(
400-
compound=h2o, n_compounds=100, sphere=bounds, edge=edge
400+
compound=h2o, n_compounds=120, sphere=bounds, edge=edge
401401
)
402402
target_diameter = (bounds[3] - edge) * 2
403403
assert np.allclose(

0 commit comments

Comments
 (0)
Please sign in to comment.