Merge pull request #43 from obidam/adapt-to-numpy-125

Merging and closing; since dask-ml CI tests failing are not related to this PR and scikit-learn tests are passed
obidam · Feb 15, 2024 · 40b9140 · 40b9140
2 parents 6ea3910 + 80bcc0b
commit 40b9140
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 14 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -169,6 +169,14 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+html_context = {
+    "github_user": "obidam",
+    "github_repo": "pyxpcm",
+    "github_version": "master",
+    "doc_path": "docs",
+}
+
+
 # Sometimes the savefig directory doesn't exist and needs to be created
 # https://github.com/ipython/ipython/issues/8733
 # becomes obsolete when we can pin ipython>=5.2; see doc/environment.yml
@@ -211,6 +219,10 @@
      u'pyXpcm Developers', 'manual'),
 ]
 
+# -- Options for Github ---------------------------------------
+# GitHub repo
+issues_github_path = "obidam/pyxpcm"
+
 
 # -- Options for manual page output ---------------------------------------
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -5,4 +5,6 @@ geos>=0.2
 nbsphinx>=0.4
 #pyproj>=2.4
 #geos>=0.2
-#cartopy
+#cartopy
+sphinx-rtd-theme
+gitpython
diff --git a/docs/whats-new.rst b/docs/whats-new.rst
@@ -3,6 +3,11 @@
 What's New
 ==========
 
+Upcoming release
+----------------
+
+- Fix bug with last numpy and integer management :issue:`42`. (:pr:`43`) by `G. Maze <http://www.github.com/gmaze>`_
+
 v0.4.1 (21 Feb. 2020)
 ---------------------
 

diff --git a/pyxpcm/models.py b/pyxpcm/models.py
@@ -139,7 +139,7 @@ def __init__(self,
 
         #todo check validity of the dict of features
 
-        self._props = {'K': np.int_(K),
+        self._props = {'K': int(K),
                        'F': len(features),
                         'llh': None,
                         'COVARTYPE': covariance_type,

diff --git a/pyxpcm/plot.py b/pyxpcm/plot.py
@@ -230,7 +230,7 @@ def subplots(m, maxcols=3, K=np.Inf, subplot_kw=None, **kwargs):
     ncols = K
 
     if K > maxcols:
-        nrows = 1 + np.int(K / maxcols)
+        nrows = 1 + int(K / maxcols)
         ncols = maxcols
     if ncols == 1:
         nrows = K

diff --git a/readthedocs.yml b/readthedocs.yml
@@ -5,18 +5,23 @@
 # Required
 version: 2
 
-# Build documentation in the docs/ directory with Sphinx
-#sphinx:
-#  configuration: docs/conf.py
+# Build PDF & ePub
+formats: all
 
-# Optionally build your docs in additional formats such as PDF and ePub
-formats:
-  - htmlzip
+build:
+#    image: latest
+    os: "ubuntu-22.04"
+    tools:
+        python: "3.8"
 
-# Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.6
-  system_packages: true
-  install:
+   install:
     - requirements: requirements.txt
-    - requirements: docs/requirements.txt
+    - requirements: docs/requirements.txt
+
+# Build documentation in the docs/ directory with Sphinx
+#sphinx:
+#  configuration: docs/conf.py
+
+#conda:
+#    environment: ci/requirements/doc.yml