Deploying to gh-pages from @ 3ca29fb 🚀

corteva · Nov 1, 2024 · 7e4ac4d · 7e4ac4d
1 parent fc18901
commit 7e4ac4d
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 40 deletions.
diff --git a/latest/.doctrees/environment.pickle b/latest/.doctrees/environment.pickle
diff --git a/latest/.doctrees/history.doctree b/latest/.doctrees/history.doctree
diff --git a/latest/_modules/rioxarray/_io.html b/latest/_modules/rioxarray/_io.html
@@ -407,7 +407,7 @@ <h1>Source code for rioxarray._io</h1><div class="highlight"><pre>
             <span class="p">)</span>
             <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_unsigned_dtype</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span> <span class="ow">and</span> <span class="bp">self</span><span class="o">.</span><span class="n">_fill_value</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">_fill_value</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_unsigned_dtype</span><span class="o">.</span><span class="n">type</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_fill_value</span><span class="p">)</span>
-            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_unsigned_dtype</span> <span class="ow">is</span> <span class="kc">None</span> <span class="ow">and</span> <span class="n">dtype</span><span class="o">.</span><span class="n">kind</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">(</span><span class="s2">&quot;i&quot;</span><span class="p">,</span> <span class="s2">&quot;u&quot;</span><span class="p">):</span>
+            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_unsigned_dtype</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
                 <span class="n">warnings</span><span class="o">.</span><span class="n">warn</span><span class="p">(</span>
                     <span class="sa">f</span><span class="s2">&quot;variable </span><span class="si">{</span><span class="n">name</span><span class="si">!r}</span><span class="s2"> has _Unsigned attribute but is not &quot;</span>
                     <span class="s2">&quot;of integer type. Ignoring attribute.&quot;</span><span class="p">,</span>

diff --git a/latest/_modules/rioxarray/merge.html b/latest/_modules/rioxarray/merge.html
diff --git a/latest/_sources/history.rst.txt b/latest/_sources/history.rst.txt
@@ -3,6 +3,7 @@ History
 
 Latest
 ------
+- BUG:merge: Fix merging masked and scaled data (issue #814)
 
 0.17.0
 ------

diff --git a/latest/history.html b/latest/history.html
@@ -159,6 +159,9 @@
 <h1>History<a class="headerlink" href="#history" title="Link to this heading"></a></h1>
 <section id="latest">
 <h2>Latest<a class="headerlink" href="#latest" title="Link to this heading"></a></h2>
+<ul class="simple">
+<li><p>BUG:merge: Fix merging masked and scaled data (issue #814)</p></li>
+</ul>
 </section>
 <section id="id1">
 <h2>0.17.0<a class="headerlink" href="#id1" title="Link to this heading"></a></h2>

diff --git a/latest/searchindex.js b/latest/searchindex.js