From 4d37f90ea58fbacf9d992b96e13ce4c509b06dc5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9verin=20Lemaignan?= Date: Tue, 6 Jun 2017 15:14:18 +0100 Subject: [PATCH] Revert "Installing assimp library as well" This reverts commit 33bd5cfcfb0f27794a333273b20b60a7a550d184. Installing the assimp library from setup.py is *not* a good idea as it will break every packaging effort. Besides, the original commit relies on an hard-coded path to find the library that may not exist. --- port/PyAssimp/pyassimp/helper.py | 5 +---- port/PyAssimp/setup.py | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py index 99d0b17..b281e94 100644 --- a/port/PyAssimp/pyassimp/helper.py +++ b/port/PyAssimp/pyassimp/helper.py @@ -8,7 +8,6 @@ import os import ctypes from ctypes import POINTER import operator -import sys try: import numpy except: numpy = None @@ -40,9 +39,7 @@ elif os.name=='nt': for dir_candidate in path_dirs: if 'assimp' in dir_candidate.lower(): additional_dirs.append(dir_candidate) - -additional_dirs += sys.path - + #print(additional_dirs) def vec2tuple(x): """ Converts a VECTOR3D to a Tuple """ diff --git a/port/PyAssimp/setup.py b/port/PyAssimp/setup.py index 8f3cdca..e683f7a 100644 --- a/port/PyAssimp/setup.py +++ b/port/PyAssimp/setup.py @@ -9,7 +9,5 @@ setup(name='pyassimp', url='https://github.com/assimp/assimp', packages=['pyassimp'], data_files=[('share/pyassimp', ['README.md']), - ('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')]), - ('lib/', [f for f in os.listdir('../../lib') if os.path.isfile(f)])], - requires=['numpy'] + ('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')])], requires=['numpy'] ) -- 2.7.4