CI trial 3 (python-travis)

esa · Sep 12, 2019 · 73610d6 · 73610d6
1 parent 8575e99
commit 73610d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -83,9 +83,6 @@ matrix:
       apt:
         sources:
         - ubuntu-toolchain-r-test
-        packages:
-        - python3.6
-
   #- env: PAGMO_PLUGINS_NONFREE_BUILD="Python27"
   #  compiler: gcc
   #  os: linux

diff --git a/tools/install_deps.sh b/tools/install_deps.sh
@@ -22,8 +22,8 @@ if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" != manylinux* ]]; then
     conda_pkgs="boost>=1.56 cmake>=3.2 pagmo>=2.0"
 
     # Only Python builds will need these
-    if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "Python36" || "${PAGMO_PLUGINS_NONFREE_BUILD}" == "OSXPython36" ]]; then
-        conda_pkgs="$conda_pkgs python=3.6 pygmo>=2.0"
+    if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "Python37" || "${PAGMO_PLUGINS_NONFREE_BUILD}" == "OSXPython36" ]]; then
+        conda_pkgs="$conda_pkgs python=3.7 pygmo>=2.0"
     elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "Python27" || "${PAGMO_PLUGINS_NONFREE_BUILD}" == "OSXPython27" ]]; then
         conda_pkgs="$conda_pkgs python=2.7 pygmo>=2.0"
     fi

diff --git a/tools/install_travis.sh b/tools/install_travis.sh
@@ -43,10 +43,11 @@ elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "OSXRelease" ]]; then
     make -j2 VERBOSE=1;
     ctest -VV;
 elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == Python* ]]; then
-    export CXX=g++-4.8
-    export CC=gcc-4.8
+    # Install pagmo_plugins_nonfree
+    cmake -DCMAKE_INSTALL_PREFIX=$deps_dir -DCMAKE_PREFIX_PATH=$deps_dir -DCMAKE_BUILD_TYPE=Release -DPPNF_BUILD_TESTS=no -DPPNF_BUILD_CPP=yes -DPPNF_BUILD_PYTHON=no ../;
+    make install VERBOSE=1;
     # Install pygmo_plugins_nonfree.
-    cmake -DCMAKE_INSTALL_PREFIX=$deps_dir -DCMAKE_PREFIX_PATH=$deps_dir -DCMAKE_BUILD_TYPE=Debug -DPPNF_BUILD_TESTS=no -DPPNF_BUILD_PYTHON=yes ../;
+    cmake -DCMAKE_INSTALL_PREFIX=$deps_dir -DCMAKE_PREFIX_PATH=$deps_dir -DCMAKE_BUILD_TYPE=Release -DPPNF_BUILD_TESTS=no -DPPNF_BUILD_CPP=no -DPPNF_BUILD_PYTHON=yes ../;
     make install VERBOSE=1;
     ipcluster start --daemonize=True;
     # Give some time for the cluster to start up. The cluster may be needed in tests of archipelagos with ipyparallel islands