Browse Source

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.
Séverin Lemaignan 8 years ago
parent
commit
4d37f90ea5
2 changed files with 2 additions and 7 deletions
  1. 1 4
      port/PyAssimp/pyassimp/helper.py
  2. 1 3
      port/PyAssimp/setup.py

+ 1 - 4
port/PyAssimp/pyassimp/helper.py

@@ -8,7 +8,6 @@ import os
 import ctypes
 import ctypes
 from ctypes import POINTER
 from ctypes import POINTER
 import operator
 import operator
-import sys
 
 
 try: import numpy
 try: import numpy
 except: numpy = None
 except: numpy = None
@@ -40,9 +39,7 @@ elif os.name=='nt':
     for dir_candidate in path_dirs:
     for dir_candidate in path_dirs:
         if 'assimp' in dir_candidate.lower():
         if 'assimp' in dir_candidate.lower():
             additional_dirs.append(dir_candidate)
             additional_dirs.append(dir_candidate)
-
-additional_dirs += sys.path
-
+            
 #print(additional_dirs)
 #print(additional_dirs)
 def vec2tuple(x):
 def vec2tuple(x):
     """ Converts a VECTOR3D to a Tuple """
     """ Converts a VECTOR3D to a Tuple """

+ 1 - 3
port/PyAssimp/setup.py

@@ -9,7 +9,5 @@ setup(name='pyassimp',
       url='https://github.com/assimp/assimp',
       url='https://github.com/assimp/assimp',
       packages=['pyassimp'],
       packages=['pyassimp'],
       data_files=[('share/pyassimp', ['README.md']),
       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']
       )
       )