Merge pull request #479 from robertodr/streamline-travis

Last-minute CI fixes on Travis
dev-cafe · Sep 2, 2018 · f337c3a · f337c3a
2 parents fc6ebfb + 7c19ef8
commit f337c3a
Show file tree

Hide file tree

Showing 23 changed files with 368 additions and 374 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -73,7 +73,6 @@ build_script:
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-04'" &&
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-05'"
     ) else (
-      bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'" &&
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-01/recipe-*'" &&
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-02/recipe-*'" &&
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-03/recipe-*'" &&
@@ -86,7 +85,8 @@ build_script:
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-10/recipe-*'" &&
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]'" &&
       bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-12/recipe-*'" &&
-      bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-13/recipe-*'"
+      bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-13/recipe-*'" &&
+      bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'"
     )
 
 deploy: off
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,7 +47,7 @@ variables:
         pipenv run python testing/collect_tests.py 'chapter-08/recipe-*' &&
         pipenv run python testing/collect_tests.py 'chapter-09/recipe-*' &&
         pipenv run python testing/collect_tests.py 'chapter-10/recipe-*' &&
-        pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1,3]' &&
+        pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]' &&
         pipenv run python testing/collect_tests.py 'chapter-12/recipe-*' &&
         pipenv run python testing/collect_tests.py 'chapter-13/recipe-*' &&
         pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'

diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,23 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+
+[*.py]
+indent_size = 4
+
+[*.{c,h,cpp,hpp,f90,F90}]
+indent_size = 2
+
+[*.rst]
+indent_size = 3
+tab_size = 3
+
+[*.yml]
+indent_size = 2
diff --git a/.travis.yml b/.travis.yml
@@ -10,42 +10,44 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages:
+            - chrpath
             - doxygen
             - g++-7
             - g++-mingw-w64
+            - gcc-7
             - gcc-mingw-w64
-            - gfortran
             - gfortran-7
             - gfortran-mingw-w64
             - graphviz
             - libatlas-dev
-            - libboost1.55-all-dev
+            - libboost-filesystem-dev
+            - libboost-python-dev
+            - libboost-test-dev
             - liblapack-dev
             - liblapacke-dev
             - libopenmpi-dev
-            - libpython3-all-dev
+            - libpython3.5-dev
             - libzmq3-dev
             - openmpi-bin
             - pkg-config
-            - python3
-            - python3-dev
+            - python3.5-dev
             - rpm
             - uuid-dev
       env:
-        - CMAKE_VERSION="3.11.2"
+        - CMAKE_VERSION="3.12.1"
         - CMAKE_GENERATOR="Unix Makefiles"
         - BUILDFLAGS="VERBOSE=1"
     - os: linux
       addons: *1
       env:
-        - CMAKE_VERSION="3.11.2"
+        - CMAKE_VERSION="3.12.1"
         - CMAKE_GENERATOR="Unix Makefiles"
         - BUILDFLAGS="VERBOSE=1"
         - ANACONDA_TESTS_ONLY=1
     - os: linux
       addons: *1
       env:
-        - CMAKE_VERSION="3.11.2"
+        - CMAKE_VERSION="3.12.1"
         - CMAKE_GENERATOR="Ninja"
         - BUILDFLAGS="-v"
     - os: linux
@@ -89,7 +91,7 @@ cache:
   pip: true
   directories:
     - $HOME/Deps/cmake/3.5.2
-    - $HOME/Deps/cmake/3.11.2
+    - $HOME/Deps/cmake/3.12.1
     - $HOME/Deps/eigen
     - $HOME/Deps/ninja
     - $HOME/Deps/conda
@@ -101,10 +103,17 @@ env:
     - LANG="en_US.UTF-8"
     - LANGUAGE="en_US.UTF-8"
     - PYTHONIOENCODING=UTF-8
+    # Invalidate PYENV_ROOT
+    - PYENV_ROOT=$HOME/fuffa
 
 before_install:
   # Dependencies are downloaded in $HOME/Downloads and installed in $HOME/Deps
   - mkdir -p $HOME/Downloads $HOME/Deps
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      export PYTHON3="/usr/bin/python3.5";
+    else
+      export PYTHON3="/usr/local/bin/python3";
+    fi
 
 install:
   - ./testing/dependencies/travis/install.sh
@@ -113,33 +122,33 @@ install:
   - ./testing/dependencies/travis/anaconda.sh
   - ./testing/dependencies/travis/eigen.sh
   - export PATH=$HOME/Deps/cmake/$CMAKE_VERSION/bin${PATH:+:$PATH}
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      pipenv install --python `type -P python3.4`;
-    else
-      pipenv install --three;
-    fi
+  - pipenv install --python $PYTHON3
   - pipenv run python --version
 
 before_script:
-  - test -n $CC && unset CC
-  - test -n $CXX && unset CXX
-  - test -n $FC && unset FC
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      test -n $CC && unset CC && export CC=gcc-7;
+      test -n $CXX && unset CXX && export CXX=g++-7;
+      test -n $FC && unset FC && export FC=gfortran-7;
+    else
+      test -n $CC && unset CC && export CC=gcc;
+      test -n $CXX && unset CXX && export CXX=g++;
+      test -n $FC && unset FC && export FC=gfortran;
+    fi
 
 script:
   - ./testing/dependencies/report_versions.sh
   - if [[ "$ANACONDA_TESTS_ONLY" == 1 ]]; then
-      travis_wait 20 pipenv run python testing/collect_tests.py 'chapter-11/recipe-04';
+      travis_wait 20 pipenv run python testing/collect_tests.py 'chapter-11/recipe-04' &&
       travis_wait 20 pipenv run python testing/collect_tests.py 'chapter-11/recipe-05';
     else
-      pipenv run python testing/collect_tests.py 'chapter-0[1-7]/recipe-*';
-      pipenv run python testing/collect_tests.py 'chapter-08/recipe-0(1|3|4|6)';
-      travis_wait 30 pipenv run python testing/collect_tests.py 'chapter-08/recipe-0(2|5)';
-      pipenv run python testing/collect_tests.py 'chapter-10/recipe-*';
-      pipenv run python testing/collect_tests.py 'chapter-11/recipe-01*';
-      pipenv run python testing/collect_tests.py 'chapter-11/recipe-02';
-      pipenv run python testing/collect_tests.py 'chapter-11/recipe-03';
-      pipenv run python testing/collect_tests.py 'chapter-12/recipe-*';
-      pipenv run python testing/collect_tests.py 'chapter-13/recipe-*';
+      pipenv run python testing/collect_tests.py 'chapter-0[1-7]/recipe-*' &&
+      pipenv run python testing/collect_tests.py 'chapter-08/recipe-0[1|3-5]' &&
+      travis_wait 30 pipenv run python testing/collect_tests.py 'chapter-08/recipe-02' &&
+      pipenv run python testing/collect_tests.py 'chapter-09/recipe-*' &&
+      pipenv run python testing/collect_tests.py 'chapter-10/recipe-*' &&
+      pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]' &&
+      pipenv run python testing/collect_tests.py 'chapter-12/recipe-*' &&
+      pipenv run python testing/collect_tests.py 'chapter-13/recipe-*' &&
       pipenv run python testing/collect_tests.py 'chapter-14/recipe-*';
-      pipenv run python testing/collect_tests.py 'chapter-15/recipe-*';
     fi
diff --git a/Pipfile b/Pipfile
@@ -13,14 +13,8 @@ colorama = "*"
 cython = "*"
 docopt = "*"
 numpy = "*"
-pathlib = "*"
-pycodestyle = "*"
 pyyaml = "*"
 sphinx = "*"
-sphinx-rtd-theme = "*"
-sphinxcontrib-bibtex = "*"
-typing = "*"
-
 
 [dev-packages]