Merge branch 'master' into feature/site_model

3 jobs for feature/site_model in 58 seconds (queued for 3 seconds)
Name Stage Failure
failed
coverage Test
Fetching changes with git depth set to 50...
Reinitialized existing Git repository in /builds/gweather/shakyground2/.git/
fatal: couldn't find remote ref refs/heads/feature/site_model
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
E   ModuleNotFoundError: No module named 'openquake'
=========================== short test summary info ============================
ERROR tests/earthquake_test.py
ERROR tests/test_site_model.py
ERROR tests/valid_test.py
!!!!!!!!!!!!!!!!!!! Interrupted: 3 errors during collection !!!!!!!!!!!!!!!!!!!!
============================== 3 errors in 0.16s ===============================
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
formatting Test
    Uninstalling shakyground2-0.1.0:
Successfully uninstalled shakyground2-0.1.0
Successfully installed shakyground2-0.1.0
$ make check
flake8 --max-line-length=96 shakyground2 setup.py
shakyground2/site_model.py:27:2: W291 trailing whitespace
make: *** [Makefile:5: check] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 1