1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
|
Description: Fix setup.py to get installation to take place via system libs, fix cython options, use setuptools.
--- a/setup.py
+++ b/setup.py
@@ -2,9 +2,8 @@
# setup script for the Python wrapper of ODE
######################################################################
-from distutils.core import setup, Extension
-import distutils.sysconfig
-import shutil, os, os.path, sys, glob, subprocess, pip
+from setuptools import setup, Extension
+import shutil, os, os.path, sys, glob, subprocess
from stat import *
@@ -12,8 +11,6 @@
f = os.popen(cmd)
return f.read()
-# Directory for pip package
-PIP_DIR = os.path.join(os.path.split(os.path.split(pip.__file__)[0])[0], 'xode', 'ode')
# Include directories
INC_DIRS = []
# Library directories
@@ -29,7 +26,7 @@
# If your version of ODE was compiled with OPCODE (trimesh support) enabled,
# this should be set to True.
-TRIMESH_ENABLE = True
+TRIMESH_ENABLE = False
######################################################################
# Windows specific settings
@@ -49,7 +46,7 @@
######################################################################
else:
- for base in ["/usr", "/usr/local", "/opt/local", os.path.expanduser("~/ode"), PIP_DIR]:
+ for base in ["/usr", "/usr/local", "/opt/local", os.path.expanduser("~/ode")]:
INC_DIRS += [os.path.join(base, "include")]
LIB_DIRS += [os.path.join(base, "lib")]
@@ -90,7 +87,7 @@
print('include "trimesh_dummy.pyx"', file=f)
f.close()
- cmd = "cython -o %s -I. -Isrc src/ode.pyx" % name
+ cmd = "cython3 -3 -o %s -I. -Isrc src/ode.pyx" % name
cython_out = name
# Check if the cython output is still up to date or if it has to be generated
@@ -122,7 +119,6 @@
"""
if install_dir:
os.makedirs(install_dir, exist_ok=True)
- subprocess.check_call(['./install_ode.sh', install_dir])
######################################################################
@@ -165,7 +161,7 @@
url = "https://github.com/filipeabperes/Py3ODE",
packages = ["xode"],
python_requires='>=3',
- install_requires=['cython'],
+ install_requires=['cython3'],
ext_modules = [Extension("ode", [install]
,libraries=LIBS
,include_dirs=INC_DIRS
|