Merge remote-tracking branch 'upstream/master'

3 jobs for master in 56 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test
failed coverage #62579

00:00:18

failed formatting #62577

00:00:19

failed test #62578

00:00:18

 
Name Stage Failure
failed
coverage Test
ERROR tests/valid_test.py
!!!!!!!!!!!!!!!!!!! Interrupted: 4 errors during collection !!!!!!!!!!!!!!!!!!!!
============================== 4 errors in 0.23s ===============================
Uploading artifacts for failed job
Uploading artifacts...
WARNING: coverage.xml: no matching files
ERROR: No files to upload
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
test Test
=========================== short test summary info ============================
ERROR tests/earthquake_test.py
ERROR tests/magnitude_scaling_relations_test.py
ERROR tests/site_model_test.py
ERROR tests/valid_test.py
!!!!!!!!!!!!!!!!!!! Interrupted: 4 errors during collection !!!!!!!!!!!!!!!!!!!!
============================== 4 errors in 0.16s ===============================
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
formatting Test
$ make check
flake8 --max-line-length=96 shakyground2 setup.py
shakyground2/site_model.py:27:2: W291 trailing whitespace
shakyground2/earthquake.py:37:5: E999 IndentationError: expected an indented block
shakyground2/earthquake.py:78:5: E112 expected an indented block
shakyground2/earthquake.py:120:9: E113 unexpected indentation
make: *** [Makefile:5: check] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 1