Skip to content

Commit 0130be5

Browse files
committed
numpy
1 parent 19c4c96 commit 0130be5

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.circleci/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ jobs:
6565
path: /tmp/circleci-artifacts
6666

6767

68-
python2:
69-
<<: *test-template
70-
docker:
71-
- image: cimg/python:2.7
72-
73-
7468
unittest:
7569
<<: *test-template
7670
steps:

api/python/SConstruct

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ if env.get('SWIG') and env.get('NUMPY'):
4747
import numpy
4848
numpy_loc = os.path.split(numpy.__file__)[0]
4949
pythinc.append(os.path.join(numpy_loc,'numarray','numpy'))
50-
pythinc.append(os.path.join(numpy_loc,'_core','include'))
50+
if int(numpy.__version.split(".")[0]) >=2:
51+
pythinc.append(os.path.join(numpy_loc,'_core','include'))
52+
else:
53+
pythinc.append(os.path.join(numpy_loc,'core','include'))
5154
except:
5255
print("\n\n\tPlease install numpy\n\n")
5356
Exit(1)

0 commit comments

Comments
 (0)