resourcecode 0.6.4__tar.gz → 1.1.0__tar.gz

{resourcecode-0.6.4 → resourcecode-1.1.0}/CHANGELOG.md

@@ -1,9 +1,24 @@
+## Version 1.1 (14/03/2024)
+### 🎉 New Features
+  - New `.to_mat()` method to export the data downloaded to a MATLAB file, with the computation of the correct MATLAB time format.
+
+### 👷 Bug fixes
+  - `spectrum.plot_1D_spectrum` no more plot the spectrum in polar coordinates;
+  - reduce default plot size in `spectrum.plot_2D_spectrum` and `spectrum.plot_1D_spectrum` and supress unwanted output
+  - in 'raw_compute_parameters_from_1D_spectrum' the CgE was not computed correctly and convert to kW/m
+  - in 'raw_compute_parameters_from_2D_spectrum': convert CgE to kW/m
+  - in 'spectrum/download_data': properly closes the connection
+
+## Version 1.0.0 (27/02/2023)
+### 📝 Documentation
+ - Switch to version 1.0.0 with the final reviews of the JOSS paper
+
 ## version 0.6.3 (29/12/2022)
 ### 🎉 New features
  - Python 3.11 is now supported
 
 ### 👷 Bug fixes
- - Fix a bung in 'get_2D_spectrum' that was preventing from downloading year 2020;
+ - Fix a bug in 'get_2D_spectrum' that was preventing from downloading year 2020;
  - Compatible with upstream release of black Python code formatter.
 
 ## version 0.6.2 (17/11/2022)

{resourcecode-0.6.4 → resourcecode-1.1.0}/CITATION.cff

@@ -8,8 +8,8 @@ type: software
 license: 'GPL-3.0-or-later'
 repository-code: "https://gitlab.ifremer.fr/resourcecode/resourcecode"
 url: "https://resourcecode.gitlab-pages.ifremer.fr/resourcecode/"
-version: 0.6.3
-date-released: '2022-12-29'
+version: 1.0.0
+date-released: '2023-02-27'
 authors:
   - given-names: Nicolas
     family-names: Raillard

{resourcecode-0.6.4 → resourcecode-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: resourcecode
-Version: 0.6.4
+Version: 1.1.0
 Summary: The ResourceCODE Marine Data Toolbox is a python package to facilitate the access to recent hindcast database of sea-state , along with a set of state-of-the-art methods for data analysis.
 Home-page: https://gitlab.ifremer.fr/resourcecode/resourcecode
 Author: Nicolas Raillard (IFREMER, Brest)
@@ -17,19 +17,32 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.9,<3.12
+Requires-Python: >=3.9,<3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYING
+Requires-Dist: pandas<2.0.0,>=1.0.0
+Requires-Dist: requests>=2.23.0
+Requires-Dist: numpy>=1.20.1
+Requires-Dist: scipy>=1.6.1
+Requires-Dist: pyextremes>=2.0.0
+Requires-Dist: pytest>=7.0.0
+Requires-Dist: pyarrow>=6.0.0
+Requires-Dist: plotly>=4.12.0
+Requires-Dist: numexpr>=2.7.0
+Requires-Dist: xarray>=0.19.0
+Requires-Dist: netCDF4>=1.6.0
 
 # Resourcecode library
 
+[![Tests](https://github.com/Resourcecode-project/py-resourcecode/actions/workflows/check.yml/badge.svg)](https://github.com/Resourcecode-project/py-resourcecode/actions/workflows/check.yml)
 [![PyPI version](https://badge.fury.io/py/resourcecode.svg)](https://badge.fury.io/py/resourcecode)
 [![Status](https://joss.theoj.org/papers/e43574f4a0b6782ee6a112180912dae0/status.svg)](https://joss.theoj.org/papers/e43574f4a0b6782ee6a112180912dae0)
 [![Downloads](https://img.shields.io/badge/dynamic/json.svg?label=downloads&url=https%3A%2F%2Fpypistats.org%2Fapi%2Fpackages%2Fresourcecode%2Frecent&query=data.last_month&colorB=brightgreen&suffix=%2FMonth)](https://pypistats.org/packages/2Fresourcecode)
@@ -57,7 +70,7 @@ in expected environmental conditions,and de-risk investment in future technology
 
 To install the toolbox, the following packages are necessary:
 
-- python (>= 3.9, <3.12)
+- python (>= 3.9, <3.13)
 - pandas (>= 1.0.0)
 - requests (>= 2.23.0)
 - numpy (>= 1.20.1)
@@ -89,7 +102,7 @@ $ source env-resourcecode/bin/activate
 
 In this virtual environment, you can now install the library. The library  is
 available on PyPI, and installation is straightforward, using the following
-command :
+command:
 
 ```
 (env-resourcecode)$ python -m pip install resourcecode
@@ -100,7 +113,7 @@ To test whether the install has been successful, you can run:
 
 ```bash
 (env-resourcecode)$ python -c "import resourcecode ; print(resourcecode.__version__)"
-0.6.4
+1.1.0
 ```
 
 which should print the current locally installed version of `resourcecode`.

{resourcecode-0.6.4 → resourcecode-1.1.0}/README.md

@@ -1,5 +1,6 @@
 # Resourcecode library
 
+[![Tests](https://github.com/Resourcecode-project/py-resourcecode/actions/workflows/check.yml/badge.svg)](https://github.com/Resourcecode-project/py-resourcecode/actions/workflows/check.yml)
 [![PyPI version](https://badge.fury.io/py/resourcecode.svg)](https://badge.fury.io/py/resourcecode)
 [![Status](https://joss.theoj.org/papers/e43574f4a0b6782ee6a112180912dae0/status.svg)](https://joss.theoj.org/papers/e43574f4a0b6782ee6a112180912dae0)
 [![Downloads](https://img.shields.io/badge/dynamic/json.svg?label=downloads&url=https%3A%2F%2Fpypistats.org%2Fapi%2Fpackages%2Fresourcecode%2Frecent&query=data.last_month&colorB=brightgreen&suffix=%2FMonth)](https://pypistats.org/packages/2Fresourcecode)
@@ -27,7 +28,7 @@ in expected environmental conditions,and de-risk investment in future technology
 
 To install the toolbox, the following packages are necessary:
 
-- python (>= 3.9, <3.12)
+- python (>= 3.9, <3.13)
 - pandas (>= 1.0.0)
 - requests (>= 2.23.0)
 - numpy (>= 1.20.1)
@@ -59,7 +60,7 @@ $ source env-resourcecode/bin/activate
 
 In this virtual environment, you can now install the library. The library  is
 available on PyPI, and installation is straightforward, using the following
-command :
+command:
 
 ```
 (env-resourcecode)$ python -m pip install resourcecode
@@ -70,7 +71,7 @@ To test whether the install has been successful, you can run:
 
 ```bash
 (env-resourcecode)$ python -c "import resourcecode ; print(resourcecode.__version__)"
-0.6.4
+1.1.0
 ```
 
 which should print the current locally installed version of `resourcecode`.

{resourcecode-0.6.4 → resourcecode-1.1.0}/examples/plot_1_data_extraction.py

@@ -82,11 +82,17 @@ spec = resourcecode.spectrum.get_2D_spectrum(
 )
 
 # %%
-# And we offers function to represent the spectral data (for 2D and 1D, even if only the 2D is shown here)
+# And we offer function to represent the spectral data, both for 2D and 1D spectrum.
 
 resourcecode.spectrum.plot_2D_spectrum(spec, 1)
 plot.show()
 
+# %%
+# There is also function to compute the 1D spectrum from the 2D.
+
+spec1D = resourcecode.spectrum.convert_spectrum_2Dto1D(spec)
+resourcecode.spectrum.plot_1D_spectrum(spec1D, 1, sea_state=False)
+
 # %%
 # Among the functionalities of the toolbox, it is possible to compute the sea-state parameters from spectral data. Small
 # discrepancies can be found between the Hindcast sea-state parameters and the one computed with the toolbox.

{resourcecode-0.6.4 → resourcecode-1.1.0}/resourcecode/__version__.py

@@ -17,5 +17,5 @@
 # You should have received a copy of the GNU General Public License along
 # with Resourcecode. If not, see <https://www.gnu.org/licenses/>.
 
-numversion = (0, 6, 4)
+numversion = (1, 1, 0)
 __version__ = ".".join(str(num) for num in numversion)

{resourcecode-0.6.4 → resourcecode-1.1.0}/resourcecode/io.py

@@ -19,14 +19,12 @@
 # with Resourcecode. If not, see <https://www.gnu.org/licenses/>.
 
 import json
-from typing import Optional, TYPE_CHECKING, Union, Any
-from os import PathLike
-from io import BufferedIOBase
+from typing import TYPE_CHECKING, Union
 from pathlib import Path
 
 import xarray
-from xarray.backends.common import AbstractDataStore
 import pandas as pd
+import scipy
 
 from resourcecode.data import DATA_DIR
 
@@ -41,7 +39,7 @@ with open(DATA_DIR / "netcdf_description.json") as fobj:
 
 
 def to_netcdf(
-    dataframe: pd.DataFrame, path: Optional[Union[str, Path]] = None
+    dataframe: pd.DataFrame, path: Union[str, Path, None] = None
 ) -> Union[bytes, "Delayed", None]:
     """Write dataframe contents to a netCFD file.
 
@@ -69,9 +67,35 @@ def to_netcdf(
     return xr.to_netcdf(path)
 
 
-def read_netcdf(
-    filename_or_obj: Union[str, PathLike[Any], BufferedIOBase, AbstractDataStore]
-) -> pd.DataFrame:
+def to_mat(
+    dataframe: pd.DataFrame,
+    path: Union[str, Path] = "data.mat",
+    name: Union[str, None] = "rscd",
+) -> Union[bytes, "Delayed", None]:
+    """Write dataframe contents to a MATLAB file.
+
+    Parameters
+    ----------
+    path: str, Path or file-like, optional
+        Path to which to save this dataset. File-like objects are only supported
+        by the scipy engine.
+    name: str
+        The name of the structure containing the data in the MATLAB file.
+
+    """
+
+    df = dataframe.reset_index(
+        names="time"
+    )  # convert the pandas index to a proper variable
+    df.time = 719529 + pd.to_numeric(df.time) / (
+        3600 * 1e9 * 24
+    )  # 1970-01-01 + time in fractional days from nanoseconds
+    scipy.io.savemat(path, {name: df.to_dict("list")})
+
+    return df.to_mat(path)
+
+
+def read_netcdf(filename_or_obj: Union[str, Path]) -> pd.DataFrame:
     """Open and decode a dataframe from a file or file-like object.
 
     Parameters
@@ -82,7 +106,6 @@ def read_netcdf(
         ends with .gz, in which case the file is gunzipped and opened with
         scipy.io.netcdf (only netCDF3 supported). Byte-strings or file-like
         objects are opened by scipy.io.netcdf (netCDF3) or h5py (netCDF4/HDF).
-
     Returns
     -------
     dataframe: pd.DataFrame

{resourcecode-0.6.4 → resourcecode-1.1.0}/resourcecode/spectrum/compute_parameters.py

@@ -180,8 +180,8 @@ def raw_compute_parameters_from_1D_spectrum(
     cg = 0.5 * c1 * c2
 
     # Energy flux
-    cgef = np.trapz(cg * Ef, x=freq) / M0
-    CgE = water_density * g * cgef
+    cgef = np.trapz(cg * Ef, x=freq)
+    CgE = water_density * g * cgef / 1000
 
     return SeaStatesParameters(
         Hm0,
@@ -253,7 +253,7 @@ def raw_compute_parameters_from_2D_spectrum(
 
     # Energy flux
     cgef = np.trapz(cg[:, np.newaxis] * E.T, x=vdir, axis=1)
-    parameters.CgE = water_density * g * np.trapz(cgef, x=freq)
+    parameters.CgE = water_density * g * np.trapz(cgef, x=freq) / 1000
 
     # compute direction from (°)
     aa = (E.T * np.cos(vdir)).T

{resourcecode-0.6.4 → resourcecode-1.1.0}/resourcecode/spectrum/download_data.py

@@ -23,6 +23,7 @@ import tempfile
 import urllib.request
 import xarray
 from typing import Iterable
+import contextlib
 
 from resourcecode.data import get_grid_spec, get_covered_period
 
@@ -77,7 +78,7 @@ def download_single_2D_file(
     if int(month) < 1 or int(month) > 12:
         raise ValueError(f"{month} must by between 1 and 12 with a leading zero")
 
-    with urllib.request.urlopen(url) as response:
+    with contextlib.closing(urllib.request.urlopen(url)) as response:
         with tempfile.NamedTemporaryFile(delete=False, suffix=".nc") as tmp_file:
             shutil.copyfileobj(response, tmp_file)
     with xarray.open_dataset(tmp_file.name) as ds:
@@ -143,7 +144,7 @@ def download_single_1D_file(
             f"{month} must by between 1 and 12 with a leading zero if needed."
         )
 
-    with urllib.request.urlopen(url) as response:
+    with contextlib.closing(urllib.request.urlopen(url)) as response:
         with tempfile.NamedTemporaryFile(delete=False, suffix=".nc") as tmp_file:
             shutil.copyfileobj(response, tmp_file)
     with xarray.open_dataset(tmp_file.name) as ds:

{resourcecode-0.6.4 → resourcecode-1.1.0}/resourcecode/spectrum/plots.py

@@ -37,7 +37,8 @@ def plot_2D_spectrum(
     cut_off: float = 0.4,
     trim: float = 0.01,
 ) -> plt.Figure:
-    """Plot the 2D spectrum at a specific time
+    """
+    Plot the 2D spectrum at a specific time
 
     Parameters
     ----------
@@ -51,13 +52,14 @@ def plot_2D_spectrum(
     normalize:
         Should the spectrum be normalized (at a max value of 1) ?
     cut_off:
-        cut-off frequency above with the spectrum is not plotted
+        cut-off frequency above which the spectrum is not plotted
     trim:
         removes the values of the spectral density lower than this value
     Returns
     -------
 
     fig: figure containing the spectrum
+
     """
     if time > data.time.size:
         raise IndexError(f"time is out the length of the Dataset: {data.time.size}")
@@ -67,8 +69,8 @@ def plot_2D_spectrum(
         direction = np.append(data.sortby("direction").direction.to_numpy(), 360.0)
         # Create the new figure
         fig = plt.figure(
-            figsize=(10, 10),
-            dpi=400,
+            figsize=(9, 9),
+            dpi=100,
             facecolor="w",
             edgecolor="w",
         )
@@ -118,7 +120,7 @@ def plot_2D_spectrum(
             edgecolors="face",  # for a better output
             cmap="PuBu",
         )
-        ax.set_ylim([0, cut_off])  # Zoom in the area where there are interesting things
+        ax.set_ylim(0, cut_off)  # Zoom in the area where there are interesting things
         ax.set_rlabel_position(89)  # Rotate a little bit the legend to avoid colliding
 
         # Add horizontal axis label
@@ -130,7 +132,7 @@ def plot_2D_spectrum(
         if sea_state:
             plt.annotate(
                 sea_state_str,
-                [np.pi / 3 - 0.1, cut_off * 1.05],
+                (np.pi / 3 - 0.1, cut_off * 1.05),
                 annotation_clip=False,
             )
         # Construct the title from the attributes of the Dataset
@@ -161,19 +163,19 @@ def plot_2D_spectrum(
         # Add the resourcecode caption
         plt.annotate(
             "\nSource: Resourcecode hindcast database\nresourcecode.ifremer.fr",
-            xy=(7 / 8 * np.pi, 1.1 * cut_off),
+            xy=(7 / 8 * np.pi, 1.15 * cut_off),
             annotation_clip=False,
         )
-
-    return ax
+    return fig
 
 
 def plot_1D_spectrum(
     data: xarray.Dataset,
     time: int,
     sea_state: bool = True,
-) -> plt.axis:
-    """Plot the 1D spectrum at a specific time
+) -> plt.Figure:
+    """
+    Plot the 1D spectrum at a specific time
 
     Parameters
     ----------
@@ -188,64 +190,66 @@ def plot_1D_spectrum(
     -------
 
     fig: figure containing the spectrum
+
     """
     if time > data.time.size:
         raise IndexError(f"time is out the length of the Dataset: {data.time.size}")
     else:
         # Create the new figure
         fig = plt.figure(
-            figsize=(8, 6),
-            dpi=400,
+            figsize=(7, 5),
+            dpi=100,
             facecolor="w",
             edgecolor="w",
         )
-        rect = [0.1, 0.1, 0.8, 0.8]
 
-        # Switch to polar coordinates
-        ax = PolarAxes(fig, rect)
-        fig.add_axes(ax)
-        plt.plot(data.frequency.to_numpy(), data.ef[time, :].to_numpy())
+        plt.plot(data.frequency, data.ef[time, :])
         plt.xlabel(r"f ($Hz$)")
         plt.ylabel(r"Wave spectral density ($m^2 s$)")
         plt.ylim(bottom=0)
         plt.xlim(left=0, right=max(data.frequency.data))
         _, top = plt.ylim()
 
-        # Compute the sea-state parameters from the 1D spectrum to be consistent
-        # with the 2D case
-        params = raw_compute_parameters_from_1D_spectrum(
-            data.ef[time, :].to_numpy(),
-            freq=data.frequency.to_numpy(),
-            depth=data.dpt[time].data,
-        )
-
         if sea_state:
+            # Compute the sea-state parameters from the 1D spectrum to be consistent
+            # with the 2D case
+            params = raw_compute_parameters_from_1D_spectrum(
+                data.ef[time, :].to_numpy(),
+                freq=data.frequency.to_numpy(),
+                depth=data.dpt[time].data,
+            )
             sea_state_str = "\n".join(
                 [
                     f"Hs: {params.Hm0:.2f}m",
                     f"Tp: {params.Tp:.2f}s",
-                    f"Mean direction at Tp: {float(data.th1p[time]):.2f}°",
-                    f"Directionnal spreading: {float(data.sth1p[time]):.2f}°",
+                    # f"Mean direction at Tp: {float(data.th1p[time]):.2f}°",
+                    # f"Directional spreading: {float(data.sth1p[time]):.2f}°",
                     f"Wind speed: {float(data.wnd[time]):.2f}m/s",
                     f"Wind direction: {float(data.wnddir[time]):.2f}°",
-                    "\nSource: Resourcecode hindcast database",
+                    "\nSource: Resourcecode database",
                     "resourcecode.ifremer.fr",
                 ]
             )
+            plt.annotate(
+                sea_state_str,
+                xy=(0.55, 0.55),
+                xycoords="figure fraction",
+                annotation_clip=False,
+            )
         else:
-            sea_state_str = "\n".join(
+            sea_state_str = " ".join(
                 [
-                    "\nSource: Resourcecode hindcast database",
-                    "resourcecode.ifremer.fr",
+                    "Source: Resourcecode database",
+                    "\nresourcecode.ifremer.fr",
                 ]
             )
-        plt.annotate(
-            sea_state_str,
-            [0.5, top / 2],
-            [0.5, top / 2],
-            annotation_clip=False,
-        )
-        title = " ".join(
+            plt.annotate(
+                sea_state_str,
+                xy=(0.55, 0.01),
+                xycoords="figure fraction",
+                annotation_clip=False,
+            )
+        title_str = " ".join(
             [
                 "Wave frequency spectrum at\n",
                 f"point {data.attrs['product_name'].split('_')[1].split('-')[3]}",
@@ -253,5 +257,7 @@ def plot_1D_spectrum(
                 f"on {pd.to_datetime(data.time[time].data)}",
             ]
         )
-        plt.title(title)
-        return fig
+
+        plt.title(title_str)
+        plt.close()
+    return fig

{resourcecode-0.6.4 → resourcecode-1.1.0}/resourcecode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: resourcecode
-Version: 0.6.4
+Version: 1.1.0
 Summary: The ResourceCODE Marine Data Toolbox is a python package to facilitate the access to recent hindcast database of sea-state , along with a set of state-of-the-art methods for data analysis.
 Home-page: https://gitlab.ifremer.fr/resourcecode/resourcecode
 Author: Nicolas Raillard (IFREMER, Brest)
@@ -17,19 +17,32 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.9,<3.12
+Requires-Python: >=3.9,<3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYING
+Requires-Dist: pandas<2.0.0,>=1.0.0
+Requires-Dist: requests>=2.23.0
+Requires-Dist: numpy>=1.20.1
+Requires-Dist: scipy>=1.6.1
+Requires-Dist: pyextremes>=2.0.0
+Requires-Dist: pytest>=7.0.0
+Requires-Dist: pyarrow>=6.0.0
+Requires-Dist: plotly>=4.12.0
+Requires-Dist: numexpr>=2.7.0
+Requires-Dist: xarray>=0.19.0
+Requires-Dist: netCDF4>=1.6.0
 
 # Resourcecode library
 
+[![Tests](https://github.com/Resourcecode-project/py-resourcecode/actions/workflows/check.yml/badge.svg)](https://github.com/Resourcecode-project/py-resourcecode/actions/workflows/check.yml)
 [![PyPI version](https://badge.fury.io/py/resourcecode.svg)](https://badge.fury.io/py/resourcecode)
 [![Status](https://joss.theoj.org/papers/e43574f4a0b6782ee6a112180912dae0/status.svg)](https://joss.theoj.org/papers/e43574f4a0b6782ee6a112180912dae0)
 [![Downloads](https://img.shields.io/badge/dynamic/json.svg?label=downloads&url=https%3A%2F%2Fpypistats.org%2Fapi%2Fpackages%2Fresourcecode%2Frecent&query=data.last_month&colorB=brightgreen&suffix=%2FMonth)](https://pypistats.org/packages/2Fresourcecode)
@@ -57,7 +70,7 @@ in expected environmental conditions,and de-risk investment in future technology
 
 To install the toolbox, the following packages are necessary:
 
-- python (>= 3.9, <3.12)
+- python (>= 3.9, <3.13)
 - pandas (>= 1.0.0)
 - requests (>= 2.23.0)
 - numpy (>= 1.20.1)
@@ -89,7 +102,7 @@ $ source env-resourcecode/bin/activate
 
 In this virtual environment, you can now install the library. The library  is
 available on PyPI, and installation is straightforward, using the following
-command :
+command:
 
 ```
 (env-resourcecode)$ python -m pip install resourcecode
@@ -100,7 +113,7 @@ To test whether the install has been successful, you can run:
 
 ```bash
 (env-resourcecode)$ python -c "import resourcecode ; print(resourcecode.__version__)"
-0.6.4
+1.1.0
 ```
 
 which should print the current locally installed version of `resourcecode`.

{resourcecode-0.6.4 → resourcecode-1.1.0}/resourcecode.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pandas>=1.0.0
+pandas<2.0.0,>=1.0.0
 requests>=2.23.0
 numpy>=1.20.1
 scipy>=1.6.1

{resourcecode-0.6.4 → resourcecode-1.1.0}/setup.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-# copyright 2021 IFREMER (Brest, FRANCE), all rights reserved.
+# Copyright 2020-2023 IFREMER (Brest, FRANCE), all rights reserved.
 # contact -- mailto:nicolas.raillard@ifremer.fr
 #
 # This file is part of Resourcecode.
@@ -36,7 +36,7 @@ url = "https://gitlab.ifremer.fr/resourcecode/resourcecode"
 license = "GPL-v3.0"
 
 install_requires = [
-    "pandas >= 1.0.0",
+    "pandas >= 1.0.0, < 2.0.0",
     "requests >= 2.23.0",
     "numpy >= 1.20.1",
     "scipy >= 1.6.1",
@@ -57,6 +57,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3 :: Only",
     "Operating System :: OS Independent",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
@@ -86,7 +87,7 @@ setup(
     name="resourcecode",
     version=__version__,
     license=license,
-    python_requires=">=3.9,<3.12",
+    python_requires=">=3.9,<3.13",
     description=description,
     author=author,
     author_email=author_email,

{resourcecode-0.6.4 → resourcecode-1.1.0}/tests/data/spectrum/parameters_1D.csv

@@ -1 +1 @@
-5.194480580148637, 15.114437422325874, 10.172794651518897, 8.978692992726629, 11.891518290208936, 0.47009066838590285, 0.5326093498195029, 103427.34439587827, 0.05077247933350298, 123.75179210587679, 81.5461959838867
+5.194480580148637, 15.114437422325874, 10.172794651518897, 8.978692992726629, 11.891518290208936, 0.47009066838590285, 0.5326093498195029, 174.42130711334403, 0.05077247933350298, 123.75179210587679, 81.5461959838867

resourcecode-1.1.0/tests/data/spectrum/parameters_2D.csv

@@ -0,0 +1 @@
+5.194480580148637, 15.114437422325874, 10.172794651518899, 8.978692992726629, 11.891518290208937, 0.4700906683859032, 0.5326093498195033, 174.42130711334403, 0.05077247933350298, 123.75179210587679, 81.5461959838867, 266.09333484556794, 269.1013128901865, 21.905728887699215, 1.8925680050707407

{resourcecode-0.6.4 → resourcecode-1.1.0}/tests/test_spectrum.py

@@ -20,7 +20,6 @@
 import numpy as np
 import xarray
 import pytest
-from matplotlib import pyplot as plt
 
 from resourcecode.spectrum import (
     raw_convert_spectrum_2Dto1D,
@@ -148,13 +147,11 @@ def test_get_fields_1D():
 
 def test_plot_2D_spectrum():
     got_spectrum = get_2D_spectrum("W001933N55743", ["2016"], ["05"])
-    plot_2D_spectrum(got_spectrum, 10)
-    plt.savefig("tests/output/2Dspec.png", bbox_inches="tight")
-    plt.close()
+    fig = plot_2D_spectrum(got_spectrum, 10)
+    fig.savefig("tests/output/2Dspec.png", bbox_inches="tight")
 
 
 def test_plot_1D_spectrum():
     got_spectrum = get_1D_spectrum("W001933N55743", ["2016"], ["05"])
-    plot_1D_spectrum(got_spectrum, 10)
-    plt.savefig("tests/output/1Dspec.png", bbox_inches="tight")
-    plt.close()
+    fig = plot_1D_spectrum(got_spectrum, 10)
+    fig.savefig("tests/output/1Dspec.png", bbox_inches="tight")

{resourcecode-0.6.4 → resourcecode-1.1.0}/tox.ini

@@ -1,5 +1,12 @@
+[gh]
+python =
+    3.12 = test
+	3.11 = test
+    3.10 = test
+    3.9  = test
+
 [tox]
-envlist=py3,flake8,black,mypy,check-manifest
+envlist=py{312, 311,310,39}
 
 [testenv:flake8]
 skip_install = true
@@ -18,8 +25,7 @@ deps =
 commands =
   black --check .
 
-[testenv:py3]
-basepython = python3
+[testenv:test]
 deps = -rdev_requirements.txt
 commands = pytest {posargs:--verbose --doctest-glob README.md}
 

resourcecode-0.6.4/tests/data/spectrum/parameters_2D.csv

@@ -1 +0,0 @@
-5.194480580148637, 15.114437422325874, 10.172794651518899, 8.978692992726629, 11.891518290208937, 0.4700906683859032, 0.5326093498195033, 174421.3508231151, 0.05077247933350298, 123.75179210587679, 81.5461959838867, 266.09333484556794, 269.1013128901865, 21.905728887699215, 1.8925680050707407