From ad9dbce00352e0cec7bbd5d63d5ebbd2eb999cc0 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 4 May 2023 19:44:52 +1000 Subject: [PATCH] See #3085. Don't bundle numpy as Blender already has it and it causes conflicts. --- src/blenderbim/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/blenderbim/Makefile b/src/blenderbim/Makefile index 4c56eb0c13..a9a853f5c8 100644 --- a/src/blenderbim/Makefile +++ b/src/blenderbim/Makefile @@ -664,6 +664,10 @@ endif cp -r dist/working/bpypolyskel-master/bpypolyskel dist/blenderbim/libs/site/packages/ rm -rf dist/working + # Remove dependencies also bundled with Blender + rm -rf dist/blenderbim/libs/site/packages/numpy + rm -rf dist/blenderbim/libs/site/packages/numpy.libs + cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./* rm -rf dist/blenderbim