Avoid conflicting xarray versions

SDXorg · Oct 2, 2023 · d9c43f4 · d9c43f4
1 parent 038185f
commit d9c43f4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/docs/whats_new.rst b/docs/whats_new.rst
@@ -1,6 +1,6 @@
 What's New
 ==========
-v3.12.0 (2023/XX/XX)
+v3.12.0 (2023/10/02)
 --------------------
 New Features
 ~~~~~~~~~~~~
@@ -26,7 +26,9 @@ Performance
 
 Internal Changes
 ~~~~~~~~~~~~~~~~
-- Update libraries used for building documentation and `.readthedocs.yml` . (`@enekomartinmartinez <https://github.com/enekomartinmartinez>`_)
+- Update libraries used for building documentation and `.readthedocs.yml`. (`@enekomartinmartinez <https://github.com/enekomartinmartinez>`_)
+- Avoid conflicting :py:mod:`xarray` versions. (`@enekomartinmartinez <https://github.com/enekomartinmartinez>`_)
+- Use `pandas[excel]` instead of xlrd dependency in the requirements. (`@gdrosos <https://github.com/gdrosos>`_)
 
 
 v3.11.0 (2023/08/01)

diff --git a/pysd/py_backend/data.py b/pysd/py_backend/data.py
@@ -193,8 +193,7 @@ def set_values(self, values):
 
             for index, value in values.items():
                 if isinstance(values.values[0], xr.DataArray):
-                    self.data.loc[index].loc[value.coords] =\
-                        value
+                    self.data.loc[index].loc[value.coords] = value
                 else:
                     self.data.loc[index] = value
         else:

diff --git a/pysd/py_backend/lookups.py b/pysd/py_backend/lookups.py
@@ -21,8 +21,7 @@ def set_values(self, values):
 
             for index, value in values.items():
                 if isinstance(values.values[0], xr.DataArray):
-                    self.data.loc[index].loc[value.coords] =\
-                        value
+                    self.data.loc[index].loc[value.coords] = value
                 else:
                     self.data.loc[index] = value
         else:

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 numpy<1.24
 pandas[excel]
 parsimonious
-xarray
+xarray!=2023.8,!=2023.9
 lxml
 regex
 chardet