Skip to content

Two bugs noticed... #1036

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

Merged
rocky merged 3 commits into from
Dec 7, 2020
+4 −5
Merged

Two bugs noticed... #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac269b6
Two bugs noticed...
rocky Dec 7, 2020
8994fd5
Add scikit-image
rocky Dec 7, 2020
d2f76cf
Remove scikit from TravisCI as it is now required.
rocky Dec 7, 2020
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ before_install:
- LLVM_CONFIG=/usr/bin/llvm-config-10 CXXFLAGS=-fPIC python -m pip install llvmlite
- pip install ipywidgets ipykernel requests IPython==5.0.0 langid pycountry pyenchant lxml matplotlib
- python travis.py
- pip install cython unittest2 pexpect scikit-image
- pip install cython unittest2 pexpect
install:
- sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
- make develop
Expand Down
2 changes: 1 addition & 1 deletion mathics/builtin/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,7 +1823,7 @@ def apply(self, image, stype, evaluation):
elif stype == "Bit16":
pixels = pixels_as_uint(pixels)
elif stype == "Bit":
pixels = pixels.astype(numpy.bool)
pixels = pixels.astype(numpy.int)
else:
return evaluation.message("ImageData", "pixelfmt", stype)
return from_python(numpy_to_matrix(pixels))
Expand Down
5 changes: 2 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ def read(*rnames):
CMDCLASS = {"build_ext": build_ext}
INSTALL_REQUIRES += ["cython>=0.15.1"]

if sys.platform == "darwin":
INSTALL_REQUIRES += ["scikit-image"]

# General Requirements
INSTALL_REQUIRES += [
"sympy>=1.6, < 1.7",
Expand All @@ -92,6 +89,8 @@ def read(*rnames):
"python-dateutil",
"llvmlite",
"requests",
"scikit-image",
"wordcloud", # Used in builtin/image.py by WordCloud()
]


Expand Down