develop: Merging in release branch to get hotfix changes originally m…

…ade to master
JaneliaSciComp · Aug 23, 2018 · d911afc · d911afc
2 parents 985bd28 + eb33cfe
commit d911afc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.coverage b/.coverage
diff --git a/.gitignore b/.gitignore
@@ -55,12 +55,12 @@ launch_satellite_engine/bin/launch_satellite_engine.exe
 *.cache
 *.pyc
 
-\.coverage
-
-\.idea/
+.idea/
 
 
 build/
 dist/
 pywavesurfer.egg-info/
 .pytest_cache
+htmlcov/
+.coverage
diff --git a/README.rst b/README.rst
@@ -89,7 +89,7 @@ Version History
 
 0.0.2    Oct 14, 2017    Added a check for WS version.
 
-0.0.3    Aug 23, 2018    Updated dependencies.
+0.0.3    Aug 23, 2018    Added test for WS 0.97 data files, changed an exception to a warning, updated dependencies.
 
 
 .. |Updates| image:: https://pyup.io/repos/github/JaneliaSciComp/PyWaveSurfer/shield.svg

diff --git a/developer-notes.txt b/developer-notes.txt
@@ -47,6 +47,7 @@ To run automated tests
 
        pip install --user pytest
        pip install --user pytest-pep8
+       pip install --user pytest-coverage
 
 1. Change directory to pywavesurfer