[yt-svn] commit/yt: 3 new changesets

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/c4ee15ee6327/
Changeset:   c4ee15ee6327
Branch:      yt
User:        chummels
Date:        2016-04-27 01:49:17+00:00
Summary:     Adding int wrapper to avoid deprecation warning from numpy
Affected #:  1 file

diff -r 843a342ee5101c18f9acf8a490bdea39d4ee0fc2 -r c4ee15ee632742c2612f474b4a12c1e07b482fc0 yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
--- a/yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
+++ b/yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
@@ -453,8 +453,8 @@
                 EW = np.zeros(right_index - left_index)
                 EW_indices = np.arange(left_index, right_index)
                 for k, val in enumerate(EW_indices):
-                    EW[k] = vEW[n_vbins_per_bin[i] * k: \
-                                n_vbins_per_bin[i] * (k + 1)].sum()
+                    EW[k] = vEW[int(n_vbins_per_bin[i]) * k: \
+                                int(n_vbins_per_bin[i]) * (k + 1)].sum()
                 EW = EW/self.bin_width.d
 
                 # only deposit EW bins that actually intersect the original


https://bitbucket.org/yt_analysis/yt/commits/7b1b38ba68ed/
Changeset:   7b1b38ba68ed
Branch:      yt
User:        chummels
Date:        2016-04-27 01:49:48+00:00
Summary:     Merging.
Affected #:  2 files

diff -r c4ee15ee632742c2612f474b4a12c1e07b482fc0 -r 7b1b38ba68ed006ecab2ffadc96143a55a90b291 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -994,6 +994,17 @@
         cd ..
     fi
 
+    ( ${DEST_DIR}/bin/python -c "import _ssl" 2>&1 ) 1>> ${LOG_FILE}
+    RESULT=$?
+    if  [ $RESULT -ne 0 ]
+    then
+        echo "Unable to import the python SSL bindings."
+        echo "This means that OpenSSL is not installed or your system's OpenSSL"
+        echo "installation is out of date."
+        echo "Please install OpenSSL or set INST_CONDA=1"
+        do_exit
+    fi
+
     if [ $INST_PY3 -eq 1 ]
     then
         if [ ! -e $PYTHON3/done ]

diff -r c4ee15ee632742c2612f474b4a12c1e07b482fc0 -r 7b1b38ba68ed006ecab2ffadc96143a55a90b291 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -961,6 +961,7 @@
             callback.__doc__ = CallbackMaker.__doc__
             self.__dict__['annotate_'+cbname] = types.MethodType(callback,self)
 
+    @invalidate_plot
     def annotate_clear(self, index=None):
         """
         Clear callbacks from the plot.  If index is not set, clear all 


https://bitbucket.org/yt_analysis/yt/commits/b02a8c47c9d0/
Changeset:   b02a8c47c9d0
Branch:      yt
User:        chummels
Date:        2016-04-27 13:31:03+00:00
Summary:     Changing n_vbins_per_bin to be an int array at construction
Affected #:  1 file

diff -r 7b1b38ba68ed006ecab2ffadc96143a55a90b291 -r b02a8c47c9d06013580dba4e5d559a5974d37ccb yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
--- a/yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
+++ b/yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
@@ -394,7 +394,8 @@
             #    10; this will assure we don't get spikes in the deposited
             #    spectra from uneven numbers of vbins per bin
             resolution = thermal_width / self.bin_width
-            n_vbins_per_bin = 10**(np.ceil(np.log10(subgrid_resolution/resolution)).clip(0, np.inf))
+            n_vbins_per_bin = (10 ** (np.ceil( np.log10( subgrid_resolution / 
+                               resolution) ).clip(0, np.inf) ) ).astype('int')
             vbin_width = self.bin_width.d / n_vbins_per_bin
 
             # a note to the user about which lines components are unresolved
@@ -453,8 +454,8 @@
                 EW = np.zeros(right_index - left_index)
                 EW_indices = np.arange(left_index, right_index)
                 for k, val in enumerate(EW_indices):
-                    EW[k] = vEW[int(n_vbins_per_bin[i]) * k: \
-                                int(n_vbins_per_bin[i]) * (k + 1)].sum()
+                    EW[k] = vEW[n_vbins_per_bin[i] * k: \
+                                n_vbins_per_bin[i] * (k + 1)].sum()
                 EW = EW/self.bin_width.d
 
                 # only deposit EW bins that actually intersect the original

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-svn-spacepope.org/attachments/20160428/3a696774/attachment.html>