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.

Sign up for GitHub

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

Remove Garnett as a Testing Dependency #1133

Merged
merged 9 commits into from
Aug 7, 2023
Merged

Remove Garnett as a Testing Dependency #1133

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4602874
remove garnett from tests
tommy-waltmann Jul 24, 2023
e81882d
remove garnett as a dependency
tommy-waltmann Jul 24, 2023
c79afd1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 24, 2023
3b0e075
Merge branch 'master' into remove-garnett
tommy-waltmann Aug 1, 2023
0de68f5
merge branch master into remove-garnett
tommy-waltmann Aug 2, 2023
ccaa1e5
update gsd requirements
tommy-waltmann Aug 2, 2023
80fbe03
tests work with gsd <3 and >3 versions
tommy-waltmann Aug 7, 2023
ad4ab35
sneaking in cython<3.0 requirement
tommy-waltmann Aug 7, 2023
3c47d3e
Merge branch 'master' into remove-garnett
tommy-waltmann Aug 7, 2023
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
1 change: 0 additions & 1 deletion .github/workflows/oldest-test-reqs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ ase==3.16.0
cmake==3.13.0
cython==0.29.14
dynasor==1.1b0; platform_system != "Windows"
garnett==0.7.1
gsd==2.4.2
matplotlib==3.0.0
numpy==1.15.0
Expand Down
3 changes: 1 addition & 2 deletions requirements/requirements-test-compatible.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ cmake>=3.13.0
coverage>=6.2
cython>=0.29.14, <3.0.0
dynasor>=1.1b0; platform_system != "Windows"
garnett>=0.7.1
GitPython>=3.1.24
gsd>=2.4.2, <3.0.0
gsd>=2.4.2
matplotlib>=3.0.0
numpy>=1.14.0
pillow>=6.2.0 --only-binary=pillow
Expand Down
3 changes: 1 addition & 2 deletions requirements/requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ cmake==3.27.0
coverage==7.2.7
cython==0.29.35
dynasor==1.1.1; platform_system != "Windows"
garnett==0.7.1
GitPython==3.1.32
gsd==2.9.0
gsd==3.1.0
matplotlib>=3.0.0
numpy==1.25.0
pillow>=8.0.0 --only-binary=pillow
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
tests_require=[
"ase>=3.16",
"gsd>=2.0",
"garnett>=0.7.1",
"matplotlib>=3.0",
"sympy>=1.0",
],
Expand Down
13 changes: 0 additions & 13 deletions tests/integration/test_reader_integrations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,6 @@ def test_gsd_gsd(self):
with gsd.hoomd.open(LJ_GSD, "rb") as traj:
self.run_analyses(traj)

def test_garnett_gsd(self):
import garnett

with garnett.read(LJ_GSD) as traj:
self.run_analyses(traj)

@pytest.mark.filterwarnings("ignore:Failed to import dcdreader")
def test_garnett_dcd(self):
import garnett

with garnett.read(LJ_DCD) as traj:
self.run_analyses(traj)

def test_ovito_gsd(self):
import_file = pytest.importorskip("ovito.io").import_file
pipeline = import_file(LJ_GSD)
Expand Down
10 changes: 5 additions & 5 deletions tests/validation/test_Minkowski_Structure_Metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import os

import garnett
import gsd.hoomd
import numpy as np
import numpy.testing as npt
import pytest
Expand All @@ -30,15 +30,15 @@ def test_minkowski_structure_metrics(self, structure):
expected_wl = _get_structure_data(structure, "w")
expected_avwl = _get_structure_data(structure, "avw")

with garnett.read(
snap = gsd.hoomd.open(
os.path.join(
os.path.dirname(__file__),
"files",
"minkowski_structure_metrics",
f"{structure}.gsd",
)
) as traj:
snap = traj[0]
),
mode="rb",
)[0]

voro = freud.locality.Voronoi()
voro.compute(snap)
Expand Down