Merge pull request #174 from achael/dev

version 1.2.7

Author: achael

README.rst

@@ -10,7 +10,7 @@ The package contains several primary classes for loading, simulating, and manipu
 Installation
 ------------
 
-The latest stable version (`1.2.6 <https://github.com/achael/eht-imaging/releases/tag/v1.2.6>`_) is available on `PyPi <https://pypi.org/project/ehtim/>`_. Simply install pip and run
+The latest stable version (`1.2.7 <https://github.com/achael/eht-imaging/releases/tag/v1.2.7>`_) is available on `PyPi <https://pypi.org/project/ehtim/>`_. Simply install pip and run
 
 .. code-block:: bash
 
@@ -55,7 +55,7 @@ Citation
 --------------------------------
 If you use ehtim in your publication, please cite `Chael+ 2018 <http://adsabs.harvard.edu/abs/2018ApJ...857...23C>`_.
 
-The latest version is also available as a static doi on `Zenodo <https://zenodo.org/badge/latestdoi/42943499Zenodo>`_.
+The latest version is also available as a static doi on `Zenodo <https://zenodo.org/badge/latestdoi/42943499>`_.
 
 Selected publications that use ehtim
 ------------------------------------

ehtim/const_def.py

@@ -169,17 +169,16 @@
 
 def show_noblock(pause=0.001):
     """helper function for image display with different matplotlib versions"""
-    plt.show(block=False)
-
-# this was required for matplotlib version 3.5
-#    if version.parse(mpl.__version__) <= version.parse('3.2.2'):
-#        plt.show(block=False)
-#    else:
-#        plt.ion()
-#        plt.show()
-#        plt.pause(pause)
-#        plt.draw()
-#        plt.pause(pause)
+
+# this seems to be required for matplotlib version 3.5
+    if version.parse(mpl.__version__) <= version.parse('3.2.2') or version.parse(mpl.__version__) > version.parse('3.6'):
+        plt.show(block=False)
+    else:
+        plt.ion()
+        plt.show()
+        plt.pause(pause)
+        plt.draw()
+        plt.pause(pause)
 
 FIELD_LABELS = {'time': 'Time',
                 'time_utc': 'Time (UTC)',

ehtim/obsdata.py

@@ -716,7 +716,6 @@ def unpack_bl(self, site1, site2, fields, ang_unit='deg', debias=False, timetype
 
                     allout.append(out)
 
-        #return np.array(allout, dtype=object)
         return np.array(allout)
 
     def unpack(self, fields, mode='all', ang_unit='deg', debias=False, conj=False, timetype=False):

setup.py

@@ -7,7 +7,7 @@ def read(fname):
 if __name__ == "__main__":
     setup(name="ehtim",
 
-          version = "1.2.6",
+          version = "1.2.7",
 
           author = "Andrew Chael",
           author_email = "achael@princeton.edu",
@@ -16,7 +16,7 @@ def read(fname):
           license = "GPLv3",
           keywords = "imaging astronomy EHT polarimetry",
           url = "https://github.com/achael/eht-imaging",
-          download_url = "https://github.com/achael/eht-imaging/archive/v1.2.3.tar.gz",
+          download_url = "https://github.com/achael/eht-imaging/archive/v1.2.7.tar.gz",
           packages = ["ehtim",
                       "scripts",
                       "ehtim.calibrating",