Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug with last numpy and integer management #43

Merged
merged 7 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -211,6 +219,10 @@
u'pyXpcm Developers', 'manual'),
]

# -- Options for Github ---------------------------------------
# GitHub repo
issues_github_path = "obidam/pyxpcm"


# -- Options for manual page output ---------------------------------------

Expand Down
4 changes: 3 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ geos>=0.2
nbsphinx>=0.4
#pyproj>=2.4
#geos>=0.2
#cartopy
#cartopy
sphinx-rtd-theme
gitpython
5 changes: 5 additions & 0 deletions docs/whats-new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
---------------------

Expand Down
2 changes: 1 addition & 1 deletion pyxpcm/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion pyxpcm/plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
ncols = K

if K > maxcols:
nrows = 1 + np.int(K / maxcols)
nrows = 1 + int(K / maxcols)

Check warning on line 233 in pyxpcm/plot.py

View check run for this annotation

Codecov / codecov/patch

pyxpcm/plot.py#L233

Added line #L233 was not covered by tests
ncols = maxcols
if ncols == 1:
nrows = K
Expand Down
27 changes: 16 additions & 11 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading