resourcecode 1.1.2__tar.gz → 1.3.1__tar.gz

{resourcecode-1.1.2 → resourcecode-1.3.1}/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 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
+
 ## 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.

{resourcecode-1.1.2 → resourcecode-1.3.1}/CITATION.cff

@@ -8,8 +8,8 @@ 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.2
-date-released: '2023-03-14'
+version: 1.3.1
+date-released: '2023-03-18'
 authors:
   - given-names: Nicolas
     family-names: Raillard

{resourcecode-1.1.2 → resourcecode-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: resourcecode
-Version: 1.1.2
+Version: 1.3.1
 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)
@@ -28,10 +28,10 @@ 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: 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: numpy<2.0.0,>=1.20.1
+Requires-Dist: scipy<1.14.0,>=1.6.1
 Requires-Dist: pyextremes>=2.0.0
 Requires-Dist: pytest>=7.0.0
 Requires-Dist: pyarrow>=6.0.0
@@ -39,6 +39,19 @@ Requires-Dist: plotly>=4.12.0
 Requires-Dist: numexpr>=2.7.0
 Requires-Dist: xarray>=0.19.0
 Requires-Dist: netCDF4>=1.6.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Resourcecode library
 
@@ -73,7 +86,7 @@ To install the toolbox, the following packages are necessary:
 - python (>= 3.9, <3.13)
 - pandas (>= 1.0.0)
 - requests (>= 2.23.0)
-- numpy (>= 1.20.1)
+- numpy (>= 1.20.1,  < 2.0.0)
 - scipy (>= 1.6.1)
 - pyextremes (>= 2.0.0)
 - pytest (>7.0.0)

{resourcecode-1.1.2 → resourcecode-1.3.1}/README.md

@@ -31,7 +31,7 @@ To install the toolbox, the following packages are necessary:
 - python (>= 3.9, <3.13)
 - pandas (>= 1.0.0)
 - requests (>= 2.23.0)
-- numpy (>= 1.20.1)
+- numpy (>= 1.20.1,  < 2.0.0)
 - scipy (>= 1.6.1)
 - pyextremes (>= 2.0.0)
 - pytest (>7.0.0)

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

{resourcecode-1.1.2 → resourcecode-1.3.1}/resourcecode/producible_assessment/main.py

@@ -134,7 +134,7 @@ class PTO:
                 (
                     (self.rho * self.g * self.width)
                     * np.trapz(
-                        ((c_g * s)[:, np.newaxis] * self.capture_width).T,
+                        (((c_g * s).to_numpy())[:, np.newaxis] * self.capture_width).T,
                         x=self.freqs,
                     )
                 ),

{resourcecode-1.1.2 → resourcecode-1.3.1}/resourcecode/resassess/__init__.py

@@ -107,6 +107,7 @@ def univar_monstats(
         )
     # sort rows according to the variable selected
     sorted_df = df[[varnm]].sort_values(by=varnm)
+    sorted_df.index = pd.to_datetime(df.index, format="%d/%m/%Y %H:%M")
 
     # Extract some time information
     sorted_df["month_index"] = sorted_df.index.month

{resourcecode-1.1.2 → resourcecode-1.3.1}/resourcecode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: resourcecode
-Version: 1.1.2
+Version: 1.3.1
 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)
@@ -28,10 +28,10 @@ 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: 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: numpy<2.0.0,>=1.20.1
+Requires-Dist: scipy<1.14.0,>=1.6.1
 Requires-Dist: pyextremes>=2.0.0
 Requires-Dist: pytest>=7.0.0
 Requires-Dist: pyarrow>=6.0.0
@@ -39,6 +39,19 @@ Requires-Dist: plotly>=4.12.0
 Requires-Dist: numexpr>=2.7.0
 Requires-Dist: xarray>=0.19.0
 Requires-Dist: netCDF4>=1.6.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Resourcecode library
 
@@ -73,7 +86,7 @@ To install the toolbox, the following packages are necessary:
 - python (>= 3.9, <3.13)
 - pandas (>= 1.0.0)
 - requests (>= 2.23.0)
-- numpy (>= 1.20.1)
+- numpy (>= 1.20.1,  < 2.0.0)
 - scipy (>= 1.6.1)
 - pyextremes (>= 2.0.0)
 - pytest (>7.0.0)

{resourcecode-1.1.2 → resourcecode-1.3.1}/resourcecode.egg-info/requires.txt

@@ -1,7 +1,7 @@
-pandas<2.0.0,>=1.0.0
+pandas<3.0.0,>=1.0.0
 requests>=2.23.0
-numpy>=1.20.1
-scipy>=1.6.1
+numpy<2.0.0,>=1.20.1
+scipy<1.14.0,>=1.6.1
 pyextremes>=2.0.0
 pytest>=7.0.0
 pyarrow>=6.0.0

{resourcecode-1.1.2 → resourcecode-1.3.1}/setup.py

@@ -36,10 +36,10 @@ url = "https://gitlab.ifremer.fr/resourcecode/resourcecode"
 license = "GPL-v3.0"
 
 install_requires = [
-    "pandas >= 1.0.0, < 2.0.0",
+    "pandas >= 1.0.0, < 3.0.0",
     "requests >= 2.23.0",
-    "numpy >= 1.20.1",
-    "scipy >= 1.6.1",
+    "numpy >= 1.20.1, < 2.0.0",
+    "scipy >= 1.6.1, < 1.14.0",
     "pyextremes >= 2.0.0",
     "pytest >= 7.0.0",
     "pyarrow >= 6.0.0",

resourcecode-1.3.1/tests/data/resassess/monthly_stat.csv

@@ -0,0 +1,13 @@
+,month_index,month,count,mean,std,min,25%,50%,75%,max
+0,1,January,3720.0,1.629244623655914,0.985061119603921,0.16,0.95,1.46,2.19,3.25
+1,2,February,3384.0,1.7057949172576832,0.9944190201350923,0.42,0.99,1.51,2.26,3.36
+2,3,March,3720.0,1.7692043010752687,1.0210664124543645,0.48,1.03,1.56,2.32,3.49
+3,4,April,3600.0,1.8397083333333335,1.0513148456225114,0.54,1.06,1.62,2.4,3.64
+4,5,May,3720.0,1.916241935483871,1.0913782310451607,0.59,1.11,1.67,2.47,3.82
+5,6,June,3600.0,1.9979055555555554,1.1410387053051332,0.64,1.15,1.73,2.54,4.01
+6,7,July,3720.0,2.083725806451613,1.1995030969407585,0.69,1.19,1.79,2.62,4.25
+7,8,August,3720.0,2.182067204301075,1.2780718919570744,0.73,1.23,1.85,2.7,4.54
+8,9,September,3600.0,2.292030555555556,1.3750675809140525,0.77,1.27,1.91,2.79,4.87
+9,10,October,3720.0,2.4185349462365595,1.4990603954569266,0.81,1.32,1.98,2.89,5.34
+10,11,November,3600.0,2.583997222222222,1.6945446833274531,0.86,1.36,2.04,2.99,6.05
+11,12,December,3720.0,2.913465053763441,2.230258320037026,0.9,1.41,2.11,3.11,11.09

resourcecode-1.3.1/tests/data/resassess/yearly_stat.csv

@@ -0,0 +1,6 @@
+,year,count,mean,std,min,25%,50%,75%,max
+0,2013,8760.0,0.6722237442922374,0.1695573175084886,0.16,0.54,0.69,0.82,0.94
+1,2014,8760.0,1.1821609589041095,0.144165278324439,0.94,1.06,1.18,1.31,1.44
+2,2015,8760.0,1.7719098173515981,0.2039818119452999,1.44,1.59,1.76,1.95,2.14
+3,2016,8784.0,2.585595400728597,0.2801852979958919,2.14,2.34,2.56,2.82,3.13
+4,2017,8760.0,4.3536244292237445,1.1268180410490136,3.13,3.5,4.02,4.88,11.09

{resourcecode-1.1.2 → resourcecode-1.3.1}/tests/test_resassess.py

@@ -86,7 +86,10 @@ def test_univar_monstats(data):
     for result, expected_result_path in zip((dtm, dty), stored_results):
         path = DATA_DIR / "resassess" / expected_result_path
         expected_result = pd.read_csv(path, index_col=0)
-        # count is the first column return by describe
+        expected_result = expected_result.astype(
+            {col: "int32" for col in expected_result.select_dtypes("int64").columns}
+        )
+        # count is the first column returned by 'describe()'
         count_index = result.columns.get_loc("count")
 
         # Check the first columns that could either be int (month_index, year) or

{resourcecode-1.1.2 → resourcecode-1.3.1}/tox.ini

@@ -1,7 +1,7 @@
 [gh]
 python =
     3.12 = test
-	3.11 = test
+    3.11 = test
     3.10 = test
     3.9  = test
 

resourcecode-1.1.2/tests/data/resassess/monthly_stat.csv

@@ -1,13 +0,0 @@
-,month_index,month,count,mean,std,min,25%,50%,75%,max
-0,1,January,3720.0,2.495760752688172,1.4037120387687503,0.34,1.41,2.18,3.29,8.74
-1,2,February,3384.0,2.4472960992907806,1.3630336832050176,0.39,1.38,2.25,3.2025,9.43
-2,3,March,3720.0,2.207766129032258,1.277317025521496,0.32,1.2,1.95,2.98,7.46
-3,4,April,3600.0,2.165475,1.285898661455345,0.25,1.2,1.92,2.82,10.37
-4,5,May,3720.0,1.7143387096774194,1.1771949940887039,0.3,0.88,1.35,2.2824999999999998,9.02
-5,6,June,3600.0,1.569783333333333,1.0312352998607057,0.33,0.79,1.27,2.04,7.6
-6,7,July,3720.0,1.511491935483871,1.0991405403017327,0.16,0.73,1.21,1.96,9.21
-7,8,August,3720.0,1.6573145161290321,1.1222232466541753,0.24,0.82,1.4,2.14,7.64
-8,9,September,3600.0,1.9290277777777778,1.2881320111459806,0.27,1.02,1.56,2.53,10.83
-9,10,October,3720.0,2.158524193548387,1.4430268110721758,0.21,1.07,1.84,2.87,9.59
-10,11,November,3600.0,2.658083333333333,1.6201816567904592,0.25,1.32,2.37,3.6025,8.81
-11,12,December,3720.0,2.87141129032258,1.66528295716784,0.32,1.62,2.5549999999999997,3.82,11.09

resourcecode-1.1.2/tests/data/resassess/yearly_stat.csv

@@ -1,6 +0,0 @@
-,year,count,mean,std,min,25%,50%,75%,max
-0,2013,8760.0,2.0655125570776254,1.3856610589271277,0.16,1.02,1.71,2.73,10.37
-1,2014,8760.0,1.9301586757990865,1.3724038326515893,0.21,0.9,1.54,2.57,9.59
-2,2015,8760.0,2.3694600456621004,1.4491890227336894,0.24,1.19,2.07,3.24,10.83
-3,2016,8784.0,2.0263945810564667,1.3426834857856436,0.24,1.08,1.67,2.59,11.09
-4,2017,8760.0,2.1755205479452053,1.3853472362497223,0.3,1.08,1.87,2.94,9.43