Skip to content

Commit

Permalink
Merge pull request #105 from ocefpaf/unpin_mamba
Browse files Browse the repository at this point in the history
remove mamba's pin
  • Loading branch information
ocefpaf authored Mar 29, 2024
2 parents c8d7caa + b6e8a84 commit f527b7d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion ioos_qc/qartod.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
import numpy as np
import pandas as pd

try:
from numba.core.errors import NumbaTypeError
except ImportError:
NumbaTypeError = TypeError

from ioos_qc.utils import (
isnan,
isfixedlength,
Expand Down Expand Up @@ -739,7 +744,7 @@ def window_func(w):
# When pandas>=1.0 and numba are installed, this is about twice as fast
try:
return w.apply(np.ptp, raw=True, engine='numba')
except (ImportError, TypeError):
except (ImportError, TypeError, NumbaTypeError):
return w.apply(np.ptp, raw=True)
check_func = np.ptp
else:
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ erddapy
flake8
isort
nco
numba<0.57
numba
pytest
pytest-flake8>=1.0.4 # https://github.com/tholo/pytest-flake8/pull/59

0 comments on commit f527b7d

Please sign in to comment.