diff --git a/.gitattributes b/.gitattributes index b1e4e6a..aafaecf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,8 +10,11 @@ LICENSE text eol=lf *.c text eol=lf *.cpp text eol=lf *.f text eol=lf +*.for text eol=lf *.f90 text eol=lf *.md text eol=lf *.rst text eol=lf *.csv text eol=lf *.m text eol=lf +*.grc text eol=lf +*.pas text eol=lf diff --git a/.travis.yml b/.travis.yml index af7cf9e..9b19582 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,12 @@ language: generic +fast_finish: true os: - linux - osx -env: TRAVIS_PYTHON_VERSION=3.6 FC=gfortran +env: + - FC=gfortran notifications: email: false @@ -32,8 +34,8 @@ before_install: - conda config --set always_yes yes --set changeps1 no - conda update -q conda - - conda create -n test python=$TRAVIS_PYTHON_VERSION - - source activate test +# - conda create -n test python=$TRAVIS_PYTHON_VERSION +# - source activate test - pip -q install coveralls install: