Skip to content

Commit

Permalink
Update for dependencies removing deprecations...
Browse files Browse the repository at this point in the history
  • Loading branch information
rupertnash committed Jun 18, 2024
1 parent 7c2c48c commit 755d4a7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion python-tools/hlb/parsers/extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ def _DetermineTimes(self):
times[iT] = xdrlib.Unpacker(timeBuf).unpack_uhyper()
continue

assert np.alltrue(
assert np.all(
np.argsort(times) == np.arange(len(times))
), "Times in extraction file are not monotonically increasing!"
self.times = times
Expand Down
2 changes: 1 addition & 1 deletion python-tools/hlb/parsers/geometry/BaseSite.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cdef public enum:
WALL_NORMAL_AVAILABLE = 1

cdef class BaseSite:
def __init__(self, block, np.ndarray[np.int_t] sgIdx):
def __init__(self, block, np.ndarray[np.int64_t] sgIdx):
self.GetBlock = weakref.ref(block)
self.Index = sgIdx
self.IntersectionType = None
Expand Down
2 changes: 1 addition & 1 deletion python-tools/hlb/parsers/geometry/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def __init__(self, shape):
"""shape is the number of elements along each dimension of the
array."""

self.shape = np.array(shape).squeeze()
self.shape = np.array(shape, dtype=int).squeeze()
self.ndim = len(self.shape)
self._conv = np.array(
[np.prod(self.shape[i:]) for i in range(1, self.ndim + 1)], dtype=int
Expand Down
5 changes: 2 additions & 3 deletions python-tools/tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[tox]
envlist = py36,py37,py38,py39,py10
envlist = py38,py39,py310,py311
isolated_build = true

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[testenv]
deps = -rtest-requirements.txt
Expand Down

0 comments on commit 755d4a7

Please sign in to comment.