Merge remote-tracking branch 'origin/develop' into feature/aligned_makeshared

2020-06-23 18:37:25 -04:00 · 2020-06-23 18:37:25 -04:00 · 9561244b39
parent b41809203f 9daeb39267
commit 9561244b39
2 changed files with 3 additions and 2 deletions
--- 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:
--- 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