OSX build trial N.3

esa · Sep 14, 2019 · 490a4e9 · 490a4e9
1 parent 0253881
commit 490a4e9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -94,7 +94,7 @@ matrix:
 #    os: osx
 #  - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXRelease"
 #    os: osx
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXPython36"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXPython37"
     os: osx
   - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXPython27"
     os: osx

diff --git a/tools/install_deps.sh b/tools/install_deps.sh
@@ -22,7 +22,7 @@ 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}" == "Python37" || "${PAGMO_PLUGINS_NONFREE_BUILD}" == "OSXPython36" ]]; then
+    if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "Python37" || "${PAGMO_PLUGINS_NONFREE_BUILD}" == "OSXPython37" ]]; 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"

diff --git a/tools/install_travis.sh b/tools/install_travis.sh
@@ -49,9 +49,6 @@ elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == Python* ]]; then
     # Install pygmo_plugins_nonfree.
     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
-    sleep 20;
     # Move out of the build dir.
     cd ../tools
     # Run the test suite
@@ -123,8 +120,6 @@ elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == Python* ]]; then
         fi
     done
 elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == OSXPython* ]]; then
-    export CXX=clang++
-    export CC=clang
     # Install pagmo_plugins_nonfree
     cmake -DCMAKE_INSTALL_PREFIX=$deps_dir -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Release -DPPNF_BUILD_TESTS=no -DPPNF_BUILD_CPP=yes -DPPNF_BUILD_PYTHON=no ../;
     make install VERBOSE=1;