Skip to content

Commit

Permalink
oh blender
Browse files Browse the repository at this point in the history
  • Loading branch information
mikedh committed Nov 1, 2024
1 parent 740ca2b commit 6a11625
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ USER root
RUN trimesh-setup --install=test,gmsh,gltf_validator,llvmpipe,binvox,blender
USER user

RUN blender --version

# install things like pytest and make sure we're on Numpy 2.X
RUN pip install .[all] && \
python -c "import numpy as n; assert(n.__version__.startswith('2'))"
Expand Down
8 changes: 4 additions & 4 deletions docker/trimesh-setup
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ config_json = """
],
"test": [
"curl",
"git"
"git",
"libxkbcommon0"
],
"gmsh": ["libxft2", "libxinerama-dev", "libxcursor1","libgomp1"]
},
Expand Down Expand Up @@ -75,7 +76,6 @@ config_json = """
"target": "$PATH",
"chmod": {"blender": 755},
"strip_components": 1
}
}
}
Expand Down Expand Up @@ -363,16 +363,16 @@ if __name__ == "__main__":
# collect `apt-get install`-able package
apt_select = []
handlers = {
"fetch": lambda x: handle_fetch(**x),
"apt": lambda x: apt_select.extend(x),
"fetch": lambda x: handle_fetch(**x),
}

# allow comma delimiters and de-duplicate
if args.install is None:
parser.print_help()
exit()
else:
select = set(" ".join(args.install).replace(",", " ").split())
select = " ".join(args.install).replace(",", " ").split()

log.debug(f'installing metapackages: `{", ".join(select)}`')

Expand Down
6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ classifiers = [
"Topic :: Multimedia :: Graphics",
"Topic :: Multimedia :: Graphics :: 3D Modeling"
]
urls = {Homepage = "https://github.com/mikedh/trimesh"}

dependencies = ["numpy>=1.20"]

[project.urls]
homepage = "https://github.com/mikedh/trimesh"
documentation = "https://trimesh.org"

[project.readme]
file = "README.md"
content-type = "text/markdown"
Expand Down

0 comments on commit 6a11625

Please sign in to comment.