From 263a1d2afa7714a76b00771579202bbc543fa872 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 22 Jun 2020 16:47:37 -0500 Subject: [PATCH 1/2] export cython install path so it can be picked up by other cmake projects --- gtsam_extra.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/gtsam_extra.cmake.in b/gtsam_extra.cmake.in index 8a9a13648..01ac00b37 100644 --- a/gtsam_extra.cmake.in +++ b/gtsam_extra.cmake.in @@ -9,5 +9,6 @@ set (GTSAM_USE_TBB @GTSAM_USE_TBB@) set (GTSAM_DEFAULT_ALLOCATOR @GTSAM_DEFAULT_ALLOCATOR@) if("@GTSAM_INSTALL_CYTHON_TOOLBOX@") + list(APPEND GTSAM_CYTHON_INSTALL_PATH "@GTSAM_CYTHON_INSTALL_PATH@") list(APPEND GTSAM_EIGENCY_INSTALL_PATH "@GTSAM_EIGENCY_INSTALL_PATH@") endif() From 9daeb39267f80bef157c0d11e60f371e57a179bb Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Tue, 23 Jun 2020 16:08:44 -0500 Subject: [PATCH 2/2] Set minimum supported numpy version to 1.11.0 (#366) * add deadsnakes ppa to install python3.6 on Ubuntu Xenial * updated travis distro to Ubuntu 18.04 bionic * Revert "updated travis distro to Ubuntu 18.04 bionic" This reverts commit 323264a924e8554da49c27a374e9a6278c5a659e. * restrict numpy version to be less than 1.19.0 * use ubuntu packaged numpy as baseline version to test against * downgrade minimum required version of numpy to version supported by Ubuntu Xenial * undo explicit pip install --- .travis.yml | 3 ++- cython/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca6a426ea..d8094ef4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ addons: - clang-9 - build-essential pkg-config - cmake - - libpython-dev python-numpy + - python3-dev libpython-dev + - python3-numpy - libboost-all-dev # before_install: diff --git a/cython/requirements.txt b/cython/requirements.txt index cd77b097d..8d3c7aeb4 100644 --- a/cython/requirements.txt +++ b/cython/requirements.txt @@ -1,3 +1,3 @@ Cython>=0.25.2 backports_abc>=0.5 -numpy>=1.12.0 +numpy>=1.11.0