Skip to content

Commit

Permalink
Merge pull request #30 from erdc/flake8
Browse files Browse the repository at this point in the history
Flake8 & Pylint fixes
  • Loading branch information
snowman2 committed Sep 22, 2017
2 parents 08e8157 + cdf6f8a commit 621fb33
Show file tree
Hide file tree
Showing 41 changed files with 4,436 additions and 3,490 deletions.
4 changes: 4 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[MESSAGES CONTROL]
disable=invalid-name,bad-continuation,too-many-lines,superfluous-parens,too-many-arguments,too-many-branches,too-many-statements,too-many-locals,too-few-public-methods,too-many-instance-attributes
[TYPECHECK]
ignored-modules=numpy,netCDF4,scipy,scipy.spatial
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ before_install:
#-----------------------------------------------------------------------------
- conda config --add channels conda-forge
- conda install --yes cmake gdal future netcdf4 numpy pandas pangaea pyproj pytz requests rtree scipy shapely
- conda install --yes pytest-cov
- pip install coveralls
- source deactivate rapid

#-------------------------------------------------------------------------------
Expand All @@ -81,9 +79,8 @@ before_install:
- git clone https://github.com/c-h-david/rapid.git --branch 20161221
- cd rapid
# Installing RAPID Prereqs
- chmod +x rapid_install_prereqs.sh
- ./rapid_install_prereqs.sh -i=$INSTALLZ_DIR
- source ./rapid_specify_varpath.sh $INSTALLZ_DIR
- bash rapid_install_prereqs.sh -i=$INSTALLZ_DIR
- source rapid_specify_varpath.sh $INSTALLZ_DIR
# Building RAPID
- cd src
- make rapid
Expand All @@ -92,7 +89,6 @@ before_install:
#Installing TauDEM
#-------------------------------------------------------------------------------
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
wget http://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh -O miniconda.sh ;
cd $TRAVIS_BUILD_DIR/.. ;
git clone https://github.com/dtarb/TauDEM.git ;
cd TauDEM/src ;
Expand All @@ -107,13 +103,14 @@ before_install:
#*******************************************************************************
install:
- cd $TRAVIS_BUILD_DIR
- python setup.py install
- pip install -e .[tests]
#*******************************************************************************
#Testing RAPIDpy
#*******************************************************************************
- cd $TRAVIS_BUILD_DIR/tests
script:
- py.test --cov-report term-missing --cov=RAPIDpy
- flake8 RAPIDpy
- pylint RAPIDpy
##ADD Coveralls stats for code coverage
after_success:
- coveralls
10 changes: 8 additions & 2 deletions RAPIDpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# -*- coding: utf-8 -*-
from .rapid import RAPID
from .dataset import RAPIDDataset
"""
RAPIDpy
Created by Alan D Snow, 2015.
License: BSD 3-Clause
"""
from .rapid import RAPID # noqa
from .dataset import RAPIDDataset # noqa

0 comments on commit 621fb33

Please sign in to comment.