Merge branch 'hotfix/0.7.52'

uoregon-postlethwait · Feb 12, 2019 · 2dbce49 · 2dbce49
2 parents 4107e3a + bcc2615
commit 2dbce49
Show file tree

Hide file tree

Showing 14 changed files with 708 additions and 12 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.51
+0.7.52
diff --git a/prost/__main__.py b/prost/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/_version.py b/prost/_version.py
@@ -1,2 +1,2 @@
 # Autogenerated via git flow.
-__version__ = '0.7.51'
+__version__ = '0.7.52'
diff --git a/prost/alignment.py b/prost/alignment.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/annotation.py b/prost/annotation.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/command_line.py b/prost/command_line.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/common.py b/prost/common.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/constants.py b/prost/constants.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/db_caching.py b/prost/db_caching.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2015  Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/excel.py b/prost/excel.py
@@ -26,7 +26,7 @@
 
 """
 
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/prost.py b/prost/prost.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #

diff --git a/prost/test/test_gen_loc_perc_cols.py b/prost/test/test_gen_loc_perc_cols.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2015  Peter Batzel and Jason Sydes
+# Copyright (C) 2015-2019 University of Oregon
 #
 # This file is part of Prost!.
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ @@
     """
-    # Copyright (C) 2014-2017 Peter Batzel and Jason Sydes
+    # Copyright (C) 2015-2019 University of Oregon
     #
     # This file is part of Prost!.
     #
@@ Expand Down @@