diff --git a/.circleci/config.yml b/.circleci/config.yml index 83440aa13..aa4b1fb60 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,12 +65,6 @@ jobs: path: /tmp/circleci-artifacts - python2: - <<: *test-template - docker: - - image: cimg/python:2.7 - - unittest: <<: *test-template steps: diff --git a/api/python/SConstruct b/api/python/SConstruct index da4ea12ab..a007e8317 100644 --- a/api/python/SConstruct +++ b/api/python/SConstruct @@ -47,7 +47,10 @@ if env.get('SWIG') and env.get('NUMPY'): import numpy numpy_loc = os.path.split(numpy.__file__)[0] pythinc.append(os.path.join(numpy_loc,'numarray','numpy')) - pythinc.append(os.path.join(numpy_loc,'_core','include')) + if int(numpy.__version.split(".")[0]) >=2: + pythinc.append(os.path.join(numpy_loc,'_core','include')) + else: + pythinc.append(os.path.join(numpy_loc,'core','include')) except: print("\n\n\tPlease install numpy\n\n") Exit(1)