Skip to content

Commit

Permalink
Merge pull request #2290 from mikedh/release/revolve
Browse files Browse the repository at this point in the history
Release: Revolve Caps
  • Loading branch information
mikedh authored Oct 14, 2024
2 parents 634c608 + 1e9edc1 commit 207ba23
Show file tree
Hide file tree
Showing 29 changed files with 829 additions and 422 deletions.
30 changes: 19 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ requires = ["setuptools >= 61.0", "wheel"]
[project]
name = "trimesh"
requires-python = ">=3.8"
version = "4.4.9"
version = "4.5.0"
authors = [{name = "Michael Dawson-Haggerty", email = "[email protected]"}]
license = {file = "LICENSE.md"}
description = "Import, export, process, analyze and view triangular meshes."
Expand All @@ -32,6 +32,9 @@ dependencies = ["numpy>=1.20"]
file = "README.md"
content-type = "text/markdown"

[project.scripts]
trimesh = "trimesh:__main__.main"

[tool.setuptools]
packages = [
"trimesh",
Expand Down Expand Up @@ -84,7 +87,6 @@ easy = [
]

recommend = [
"glooey",
"sympy",
"meshio",
"pyglet<2",
Expand All @@ -94,30 +96,36 @@ recommend = [
# "python-fcl", # do collision checks # TODO : broken on numpy 2
"openctm", # load `CTM` compressed models
"cascadio", # load `STEP` files

]

# this is the list of everything that is ever added anywhere
# mostly useful for getting our test coverage up
# stuff to run simple testing
test = [
"pytest-cov",
"pytest",
"pyinstrument",
"ruff",
]

# this is the list of everything that is ever added anywhere
# mostly useful for getting our test coverage up but may not
# be easy to install on all platforms and is only really
# a good idea in our "cannonical docker images"
test_more = [
"coveralls",
"pyright",
"ezdxf",
"pytest",
"pymeshlab; python_version<='3.11'",
"pyinstrument",
"pytest-beartype; python_version>='3.10'",
"matplotlib",
"ruff",
"pytest-beartype; python_version>='3.10'"
"pymeshlab",
"triangle",
]

# interfaces.gmsh will be dropped Jan 2025
deprecated = ["gmsh==4.12.2"]

# requires pip >= 21.2
# https://hynek.me/articles/python-recursive-optional-dependencies/
all = ["trimesh[easy,recommend,test,deprecated]"]
all = ["trimesh[easy,recommend,test,test_more,deprecated]"]

[tool.ruff]
target-version = "py38"
Expand Down
5 changes: 4 additions & 1 deletion tests/test_3mf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ def test_roundtrip(self):
file_type="3mf",
)

assert set(s.geometry.keys()) == set(r.geometry.keys())
assert set(s.geometry.keys()) == set(r.geometry.keys()), (
s.geometry.keys(),
r.geometry.keys(),
)
assert g.np.allclose(s.bounds, r.bounds)
assert g.np.isclose(s.area, r.area, rtol=1e-3)

Expand Down
Loading

0 comments on commit 207ba23

Please sign in to comment.