Skip to content

Commit

Permalink
Add .editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
robertodr committed Sep 2, 2018
1 parent ccd7883 commit 86f7869
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 6 deletions.
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ matrix:
sources:
- ubuntu-toolchain-r-test
packages:
#- chrpath
- doxygen
- g++-7
- g++-mingw-w64
Expand Down Expand Up @@ -116,10 +115,9 @@ install:
- ./testing/dependencies/travis/eigen.sh
- export PATH=$HOME/Deps/cmake/$CMAKE_VERSION/bin${PATH:+:$PATH}
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
pipenv install --three
#pipenv install --python $(type -P python3.5)
pipenv install --python $(type -P /usr/bin/python3.5);
else
pipenv install --three
pipenv install --three;
fi
- pipenv run python --version

Expand All @@ -132,7 +130,7 @@ 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-05'
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)' &&
Expand All @@ -144,5 +142,5 @@ script:
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-*'
pipenv run python testing/collect_tests.py 'chapter-15/recipe-*';
fi

0 comments on commit 86f7869

Please sign in to comment.