resourcecode 1.1.3__tar.gz → 2.0.0__tar.gz

{resourcecode-1.1.3 → resourcecode-2.0.0}/CHANGELOG.md

@@ -1,7 +1,12 @@
+## Version 1.3.1 (TBD)
+ ### 👷 Bug fixes
+  - Pin version of Numpy to be < 2.0.0 because `trapz` is renamed in higher versions
+  - Pin version of Scipy to be < 1.14.0 because `mvnun` is deprecated in higher versions
+  
 ## Version 1.3 (18/03/2024)
 ### 🎉 New Features
   - Add support for pandas 2.X branch
-
+ 
 ## Version 1.2 (15/3/2024)
 ### 🎉 New Features
   - Add support for python 3.12

{resourcecode-1.1.3 → resourcecode-2.0.0}/CITATION.cff

@@ -8,7 +8,7 @@ type: software
 license: 'GPL-3.0-or-later'
 repository-code: "https://resourcecode-project.github.io/py-resourcecode/"
 url: "https://resourcecode-project.github.io/py-resourcecode/"
-version: 1.1.3
+version: 1.3.1
 date-released: '2023-03-18'
 authors:
   - given-names: Nicolas

{resourcecode-1.1.3 → resourcecode-2.0.0}/MANIFEST.in

@@ -2,16 +2,19 @@ include LICENSE
 include CITATION.cff
 include tox.ini
 include mypy.ini
-include config/config.ini
-include dev_requirements.txt
 include fp_hs.png
 exclude .gitlab-ci.yml .gitlab-ci-ifremer.yml
 include *.md
+include uv.lock
+include *.txt
 
+recursive-include config *.ini
 recursive-include notebooks *.ipynb
+global-exclude **/.ipynb_checkpoints/*
 recursive-include resourcecode *.py
 recursive-include resourcecode/data *.feather *.json
 recursive-include resourcecode *.csv
+recursive-include resourcecode/config *.ini
 
 recursive-include examples *.py
 recursive-include examples *.rst
@@ -22,6 +25,7 @@ recursive-include CLA *.pdf
 
 recursive-exclude joss_paper *
 exclude joss_paper
+exclude dev_requirements.txt
 
 prune codes_to_migrate
 prune doc

{resourcecode-1.1.3 → resourcecode-2.0.0}/PKG-INFO

@@ -1,11 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: resourcecode
-Version: 1.1.3
-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)
-Author-email: nicolas.raillard@ifremer.fr
-License: GPL-v3.0
+Version: 2.0.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.
+Author-email: Nicolas Raillard <nicolas.raillard@ifremer.fr>
+License: GPL-3.0-or-later
+Project-URL: Homepage, https://resourcecode-project.github.io/py-resourcecode/
 Project-URL: GitHub, https://github.com/Resourcecode-project/py-resourcecode
 Project-URL: Web Portal, https://resourcecode.ifremer.fr
 Project-URL: PyPI, https://pypi.org/project/resourcecode
@@ -14,38 +13,48 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
 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.13
 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.13
+Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYING
-Requires-Dist: pandas<3.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
+Requires-Dist: pandas<3,>=2.2
+Requires-Dist: requests<3,>=2.31.0
+Requires-Dist: numpy<3,>=2.0
+Requires-Dist: scipy<2,>=1.14.1
+Requires-Dist: pyextremes<3,>=2.5.0
+Requires-Dist: pyarrow<19,>=18.1.0
+Requires-Dist: plotly<7,>=6
+Requires-Dist: xarray>=2024.11.0
+Requires-Dist: netCDF4<2,>=1.7.0
+Provides-Extra: dev
+Requires-Dist: flake8>=3.6; extra == "dev"
+Requires-Dist: black>=19.10b0; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: nbqa; extra == "dev"
+Requires-Dist: check-manifest; extra == "dev"
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: tox-uv; extra == "dev"
+Provides-Extra: doc
+Requires-Dist: sphinx>=4.5; extra == "doc"
+Requires-Dist: sphinx-book-theme; extra == "doc"
+Requires-Dist: sphinx_gallery; extra == "doc"
+Requires-Dist: plotly; extra == "doc"
+Dynamic: license-file
 
 # 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)
+[![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/resourcecode)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 ## Description
@@ -66,58 +75,43 @@ in expected environmental conditions,and de-risk investment in future technology
 
 ## Installation
 
-### Dependencies
+### Requirements
 
-To install the toolbox, the following packages are necessary:
+- Python (>= 3.11, < 3.14)
+- pandas (>= 2.2, < 3)
+- numpy (>= 2.0, < 3)
+- scipy (>= 1.14.1, < 2)
+- xarray (>= 2024.11.0)
+- netCDF4 (>= 1.7.0, < 2)
+- And other dependencies (see `pyproject.toml` for the complete list)
 
-- python (>= 3.9, <3.13)
-- pandas (>= 1.0.0)
-- requests (>= 2.23.0)
-- numpy (>= 1.20.1)
-- scipy (>= 1.6.1)
-- pyextremes (>= 2.0.0)
-- pytest (>7.0.0)
-- pyarrow (>= 6.0.0)
-- plotly (>= 4.12.0)
-- numexpr (>= 2.7.0)
-- xarray (>= 0.19.0)
+### Using uv (recommended)
 
-
-### Using an environment
-
-Maybe the easiest way to install the toolbox is to create a dedicated virtual
-environment:
+The recommended way to install the toolbox is to use [`uv`](https://docs.astral.sh/uv/), a fast Python package installer:
 
 ```shell
-$ cd /your/work/directory
-$ python3 -m venv env-resourcecode
+$ uv pip install resourcecode
 ```
 
-then, you activate it:
+### Using pip
+
+Alternatively, you can use pip:
 
 ```shell
-$ source env-resourcecode/bin/activate
-(env-resourcecode)$
+$ python -m pip install resourcecode
 ```
 
-In this virtual environment, you can now install the library. The library  is
-available on PyPI, and installation is straightforward, using the following
-command:
-
-```
-(env-resourcecode)$ python -m pip install resourcecode
-[…]
-```
+### Development installation
 
-To test whether the install has been successful, you can run:
+For development, clone the repository and install with all dependencies:
 
-```bash
-(env-resourcecode)$ python -c "import resourcecode ; print(resourcecode.__version__)"
-1.1.2
+```shell
+$ git clone https://github.com/Resourcecode-project/py-resourcecode
+$ cd py-resourcecode
+$ uv sync --all-extras --dev
+$ uv run pytest
 ```
 
-which should print the current locally installed version of `resourcecode`.
-
 ## Example of use
 
 Once the library is installed and the configuration is done, you can use the

{resourcecode-1.1.3 → resourcecode-2.0.0}/README.md

@@ -3,7 +3,7 @@
 [![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)
+[![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/resourcecode)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 ## Description
@@ -24,58 +24,43 @@ in expected environmental conditions,and de-risk investment in future technology
 
 ## Installation
 
-### Dependencies
+### Requirements
 
-To install the toolbox, the following packages are necessary:
+- Python (>= 3.11, < 3.14)
+- pandas (>= 2.2, < 3)
+- numpy (>= 2.0, < 3)
+- scipy (>= 1.14.1, < 2)
+- xarray (>= 2024.11.0)
+- netCDF4 (>= 1.7.0, < 2)
+- And other dependencies (see `pyproject.toml` for the complete list)
 
-- python (>= 3.9, <3.13)
-- pandas (>= 1.0.0)
-- requests (>= 2.23.0)
-- numpy (>= 1.20.1)
-- scipy (>= 1.6.1)
-- pyextremes (>= 2.0.0)
-- pytest (>7.0.0)
-- pyarrow (>= 6.0.0)
-- plotly (>= 4.12.0)
-- numexpr (>= 2.7.0)
-- xarray (>= 0.19.0)
+### Using uv (recommended)
 
-
-### Using an environment
-
-Maybe the easiest way to install the toolbox is to create a dedicated virtual
-environment:
+The recommended way to install the toolbox is to use [`uv`](https://docs.astral.sh/uv/), a fast Python package installer:
 
 ```shell
-$ cd /your/work/directory
-$ python3 -m venv env-resourcecode
+$ uv pip install resourcecode
 ```
 
-then, you activate it:
+### Using pip
+
+Alternatively, you can use pip:
 
 ```shell
-$ source env-resourcecode/bin/activate
-(env-resourcecode)$
+$ python -m pip install resourcecode
 ```
 
-In this virtual environment, you can now install the library. The library  is
-available on PyPI, and installation is straightforward, using the following
-command:
-
-```
-(env-resourcecode)$ python -m pip install resourcecode
-[…]
-```
+### Development installation
 
-To test whether the install has been successful, you can run:
+For development, clone the repository and install with all dependencies:
 
-```bash
-(env-resourcecode)$ python -c "import resourcecode ; print(resourcecode.__version__)"
-1.1.2
+```shell
+$ git clone https://github.com/Resourcecode-project/py-resourcecode
+$ cd py-resourcecode
+$ uv sync --all-extras --dev
+$ uv run pytest
 ```
 
-which should print the current locally installed version of `resourcecode`.
-
 ## Example of use
 
 Once the library is installed and the configuration is done, you can use the

{resourcecode-1.1.3 → resourcecode-2.0.0}/examples/plot_0_Database_exploration.py

@@ -3,6 +3,7 @@
 Visualize the database configuration: nodes, bathymetry...
 ==========================================================
 """
+
 import resourcecode
 import numpy as np
 import matplotlib.pyplot as plot
@@ -27,9 +28,7 @@ resourcecode.get_grid_spec()
 # the requested location (in meters).
 
 # We select the closest node from given coordinates
-selected_node = resourcecode.data.get_closest_point(
-    latitude=48.3026514, longitude=-4.6861533
-)
+selected_node = resourcecode.data.get_closest_point(latitude=48.3026514, longitude=-4.6861533)
 selected_node
 
 # %%
@@ -80,9 +79,7 @@ plot.show()
 # of code shows and example of such a map.
 
 # Importing the data for plotting
-tri = (
-    resourcecode.get_triangles().to_numpy() - 1
-)  # The '-1' is due to the Zero-based numbering of python
+tri = resourcecode.get_triangles().to_numpy() - 1  # The '-1' is due to the Zero-based numbering of python
 field_mesh = resourcecode.data.get_grid_field().to_numpy()
 triang = mtri.Triangulation(field_mesh[:, 1], field_mesh[:, 2], tri)
 

{resourcecode-1.1.3 → resourcecode-2.0.0}/examples/plot_1_data_extraction.py

@@ -3,6 +3,7 @@
 Extract some time-series from the database and analysis
 ==========================================================
 """
+
 import resourcecode
 import resourcecode.spectrum
 import matplotlib.pyplot as plot
@@ -15,14 +16,10 @@ plot.rcParams["figure.dpi"] = 400
 # Below, we will look for data next to the location of interest, located in the vicinity of Brest Bay.
 # We will look at the time-series data and also some spectral data
 #
-selected_node = resourcecode.data.get_closest_point(
-    latitude=48.3026514, longitude=-4.6861533
-)
+selected_node = resourcecode.data.get_closest_point(latitude=48.3026514, longitude=-4.6861533)
 selected_node
 # %%
-selected_specPoint = resourcecode.data.get_closest_station(
-    latitude=48.3026514, longitude=-4.6861533
-)
+selected_specPoint = resourcecode.data.get_closest_station(latitude=48.3026514, longitude=-4.6861533)
 selected_specPoint
 
 # %%
@@ -77,9 +74,7 @@ plot.tight_layout()
 # corresponding to the orange dots of the web portal. This is possible thanks to the `get_2D_spectrum` and
 # `get_1D_spectrum` from the *spectrum* module. An example is shown below:
 
-spec = resourcecode.spectrum.get_2D_spectrum(
-    selected_specPoint[0], years=["2010"], months=["01"]
-)
+spec = resourcecode.spectrum.get_2D_spectrum(selected_specPoint[0], years=["2010"], months=["01"])
 
 # %%
 # And we offer function to represent the spectral data, both for 2D and 1D spectrum.
@@ -97,7 +92,5 @@ 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.
 
-parameters_df = resourcecode.spectrum.compute_parameters_from_2D_spectrum(
-    spec, use_depth=True
-)
+parameters_df = resourcecode.spectrum.compute_parameters_from_2D_spectrum(spec, use_depth=True)
 parameters_df.head()

{resourcecode-1.1.3 → resourcecode-2.0.0}/examples/plot_2_Multivariate_Extremes.py

@@ -3,6 +3,7 @@
 Modelling multivariate extremes
 ===============================
 """
+
 # %%
 # Extreme value modelling is a central topic in the design of offshore structures.
 #

{resourcecode-1.1.3 → resourcecode-2.0.0}/examples/plot_3_Operation_Planning.py

@@ -3,6 +3,7 @@
 Use-case example of the Operational Planning module
 ===================================================
 """
+
 # %%
 #
 # In this page, we will present some of the functionalities offered by the toolbox
@@ -34,9 +35,7 @@ MONTH_NAMES = list(calendar.month_name)
 #
 # We have selected a location next to Ushant island, node number `36855`
 
-data = client.get_dataframe_from_url(
-    "https://resourcecode.ifremer.fr/explore?pointId=136855", parameters=("hs", "tp")
-)
+data = client.get_dataframe_from_url("https://resourcecode.ifremer.fr/explore?pointId=136855", parameters=("hs", "tp"))
 
 # %%
 # Weather windows
@@ -69,12 +68,7 @@ data_matching_criteria = data.query(criteria)
 
 windetect = ww_calc(data_matching_criteria, winlen=winlen, concurrent_windows=False)
 results = wwmonstats(windetect)
-stats = (
-    results.describe(percentiles=percentiles)
-    .drop(["count", "std"])
-    .transpose()
-    .sort_index()
-)
+stats = results.describe(percentiles=percentiles).drop(["count", "std"]).transpose().sort_index()
 
 # %%
 # Plotting the monthly statistics
@@ -142,12 +136,7 @@ critical_operation = False
 
 oplendetect = oplen_calc(data_matching_criteria, oplen, critical_operation)
 results = olmonstats(oplendetect)
-stats = (
-    results.describe(percentiles=percentiles)
-    .drop(["count", "std"])
-    .transpose()
-    .sort_index()
-)
+stats = results.describe(percentiles=percentiles).drop(["count", "std"]).transpose().sort_index()
 
 # %%
 # And finally produce visual exploration of the durations.

{resourcecode-1.1.3 → resourcecode-2.0.0}/examples/plot_4_Producible.py

@@ -7,6 +7,7 @@ In this example, we will estimate WEC energy production using the ResourceCode h
 data as an input and capture width data of a standard WEC to simulate the behaviour and estimate
 energy that can be harvested with this device from the slected location.
 """
+
 # %%
 # .. seealso::
 #    In addition, a demonstration tool based on this module can be accessed on
@@ -57,9 +58,7 @@ plt.show()
 # For this example, we used the data from the SEMREVO location.
 # We only need the frequency spectrum in this case, so we convert it to a pandas DataFrame.
 
-spec1D = resourcecode.spectrum.download_data.get_1D_spectrum(
-    "SEMREVO", ["2014"], ["02"]
-)
+spec1D = resourcecode.spectrum.download_data.get_1D_spectrum("SEMREVO", ["2014"], ["02"])
 spec = spec1D.ef.to_pandas()
 
 # The frequency has been truncated, so here we reconcile both
@@ -172,9 +171,7 @@ pto_damp_kn.plot.hist(
     ax=ax2,
     bins=len(pto.capture_width.columns),
     legend=False,
-    weights=np.ones_like(pto_damp_kn[pto_damp_kn.columns[0]])
-    * 100.0
-    / len(pto_damp_kn),
+    weights=np.ones_like(pto_damp_kn[pto_damp_kn.columns[0]]) * 100.0 / len(pto_damp_kn),
 )
 ax2.grid()
 ax2.set_xlabel("PTO damping (kN.s/m)")
@@ -214,9 +211,7 @@ pto_damp_kn.plot.hist(
     ax=ax4,
     bins=len(pto.capture_width.columns),
     legend=False,
-    weights=np.ones_like(pto_damp_kn[pto_damp_kn.columns[0]])
-    * 100.0
-    / len(pto_damp_kn),
+    weights=np.ones_like(pto_damp_kn[pto_damp_kn.columns[0]]) * 100.0 / len(pto_damp_kn),
 )
 ax4.grid()
 ax4.set_xlabel("PTO damping (kN.s/m) - JONWSAP")

resourcecode-2.0.0/pyproject.toml

@@ -0,0 +1,109 @@
+[build-system]
+requires = ["setuptools>=77.0.3", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "resourcecode"
+dynamic = ["version"]
+description = "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."
+readme = "README.md"
+license = {text = "GPL-3.0-or-later"}
+requires-python = ">=3.11, <3.14"
+authors = [
+    {name = "Nicolas Raillard", email = "nicolas.raillard@ifremer.fr"}
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3 :: Only",
+    "Operating System :: OS Independent",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Mathematics",
+    "Topic :: Scientific/Engineering :: Physics",
+]
+keywords = [
+    "statistics",
+    "extreme",
+    "extreme value analysis",
+    "eva",
+    "coastal",
+    "ocean",
+    "marine",
+    "environmental",
+    "engineering",
+    "renewable",
+    "MRE",
+    "offshore",
+    "data",
+    "hindcast",
+]
+
+# Minimal version of dependencies are chosen to be compatible with marimo-wasm 0.23 compatible (cf
+# https://wasm.marimo.app/pyodide-lock.json?v=0.23.7)
+dependencies = [
+    "pandas>=2.2,<3",
+    "requests>=2.31.0,<3",
+    "numpy>=2.0,<3",
+    "scipy>=1.14.1,<2",
+    "pyextremes>=2.5.0,<3",
+    "pyarrow>=18.1.0,<19", 
+    "plotly>=6,<7",
+    "xarray>=2024.11.0",
+    "netCDF4>=1.7.0,<2",
+]
+
+[project.urls]
+Homepage = "https://resourcecode-project.github.io/py-resourcecode/"
+GitHub = "https://github.com/Resourcecode-project/py-resourcecode"
+"Web Portal" = "https://resourcecode.ifremer.fr"
+PyPI = "https://pypi.org/project/resourcecode"
+
+[project.optional-dependencies]
+dev = [
+    "flake8>=3.6",
+    "black>=19.10b0",
+    "mypy",
+    "nbqa",
+    "check-manifest",
+    "tox",
+    "tox-uv",
+]
+doc = [
+    "sphinx>=4.5",
+    "sphinx-book-theme",
+    "sphinx_gallery",
+    "plotly",
+]
+
+[tool.setuptools.dynamic]
+version = {attr = "resourcecode.__version__.__version__"}
+
+[tool.setuptools.packages.find]
+include = ["resourcecode*"]
+
+[dependency-groups]
+dev = [
+    "flake8>=3.6",
+    "black>=19.10b0",
+    "mypy",
+    "nbqa",
+    "check-manifest",
+    "tox",
+    "tox-uv",
+    "pytest>=9.0.3",
+]
+
+[tool.black]
+line-length = 120
+target-version = ["py311", "py312", "py313"]
+
+[tool.mypy]
+python_version = "3.11"
+warn_return_any = true
+warn_unused_configs = true
+ignore_missing_imports = true

{resourcecode-1.1.3 → resourcecode-2.0.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 = (1, 1, 3)
+numversion = (2, 0, 0)
 __version__ = ".".join(str(num) for num in numversion)

{resourcecode-1.1.3 → resourcecode-2.0.0}/resourcecode/client.py

@@ -114,9 +114,7 @@ class Client:
 
         return self.get_dataframe_from_criteria(criteria)
 
-    def get_dataframe_from_url(
-        self, selection_url: str, parameters: Iterable[str] = ("hs",)
-    ) -> pd.DataFrame:
+    def get_dataframe_from_url(self, selection_url: str, parameters: Iterable[str] = ("hs",)) -> pd.DataFrame:
         """Get the pandas dataframe of the data described by the url
 
         Parameters
@@ -214,15 +212,10 @@ class Client:
         try:
             node_id = int(parsed_criteria["node"])
         except ValueError:  # failed to convert node to an integer
-            raise BadPointIdError(
-                "Point Id must be an integer, can not be "
-                f"{parsed_criteria['node']!r}"
-            )
+            raise BadPointIdError("Point Id must be an integer, can not be " f"{parsed_criteria['node']!r}")
         else:
             if node_id not in self.possible_points_id:
-                raise BadPointIdError(
-                    f"{parsed_criteria['node']} is an unknown pointId."
-                )
+                raise BadPointIdError(f"{parsed_criteria['node']} is an unknown pointId.")
 
         # Cassandra database start indexing at 1, so decrement node
         parsed_criteria["node"] = parsed_criteria["node"] - 1
@@ -305,7 +298,4 @@ class Client:
         if response.ok:
             return response.json()
 
-        raise ValueError(
-            "Unable to get a response from the database"
-            "(status code = {})".format(response.status_code)
-        )
+        raise ValueError("Unable to get a response from the database" "(status code = {})".format(response.status_code))

resourcecode-2.0.0/resourcecode/config/config.ini

@@ -0,0 +1,4 @@
+[default]
+
+cassandra-base-url = https://resourcecode-datacharts.ifremer.fr/
+min-start-date = 1994-01-01T00:00:00