Skip to content

Commit

Permalink
Merge pull request #80 from CLIVAR-PRP/79_numpy-version-update-confli…
Browse files Browse the repository at this point in the history
…ct_lee1043

Conflict with newer Numpy version
  • Loading branch information
lee1043 authored Nov 11, 2024
2 parents 1dbd59a + 36fdc0f commit 6c527aa
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion lib/EnsoUvcdatToolsLib.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,22 @@
import copy
from datetime import date
from inspect import stack as INSPECTstack
from packaging.version import Version
import ntpath
import numpy
from numpy import array as NParray
from numpy import exp as NPexp
from numpy import histogram as NPhistogram
from numpy import isnan as NPisnan
from numpy import nan as NPnan
from numpy import nonzero as NPnonzero
from numpy import ones as NPones
from numpy import product as NPproduct

if Version(numpy.__version__) < Version('1.25.0'):
from numpy import product as NPproduct
else:
from numpy import prod as NPproduct

from numpy import where as NPwhere
from numpy.ma.core import MaskedArray as NPma__core__MaskedArray
from os.path import isdir as OSpath_isdir
Expand Down

0 comments on commit 6c527aa

Please sign in to comment.