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.

Sign up for GitHub

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

Adjust one check from PR #1711. #1714

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Adjust one check from PR #1711. #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f0425
Modify a function to keep the type checker happy
manthey Nov 4, 2024
39cf045
Adjust one check from PR #1711.
manthey Nov 1, 2024
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
### Improvements

- Format dates in item lists ([#1707](../../pull/1707))
- Guard dtype types ([#1710](../../pull/1710))
- Guard dtype types ([#1711](../../pull/1711), [#1714](../../pull/1714))

### Changes

- Openslide now requires the binary wheel on appropriate platforms ([#1709](../../pull/1709))
- Openslide now requires the binary wheel on appropriate platforms ([#1709](../../pull/1709), [#1710](../../pull/1710))

## 1.30.2

Expand Down
2 changes: 1 addition & 1 deletion large_image/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def cpu_count(logical: bool = True) -> int:
try:
import psutil

count = min(count, psutil.cpu_count(logical))
count = min(count, psutil.cpu_count(logical) or count)
except ImportError:
pass
return max(1, count)
Expand Down
2 changes: 1 addition & 1 deletion sources/multi/large_image_source_multi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ def _openSource(self, source, params=None):
params = source.get('params', {})
ts = openFunc(source['path'], **params)
if (self._dtype and np.dtype(ts.dtype).kind == 'f' and
np.dtype(self._dtype.kind) != 'f' and
np.dtype(self._dtype).kind != 'f' and
'sampleScale' not in source and 'sampleOffset' not in source):
minval = maxval = 0
for f in range(ts.frames):
Expand Down
2 changes: 1 addition & 1 deletion test.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN apt-get update && \
libssl-dev \
libxml2-dev \
libxmlsec1-dev \
llvm \
# llvm \
make \
tk-dev \
wget \
Expand Down