diff --git a/.travis.yml b/.travis.yml index 063f267b08..bb3b75a7b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/mathics/builtin/image.py b/mathics/builtin/image.py index 5fc856d2cb..b2a3c1d87a 100644 --- a/mathics/builtin/image.py +++ b/mathics/builtin/image.py @@ -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)) diff --git a/setup.py b/setup.py index 2f032ec501..70fda3ec9f 100644 --- a/setup.py +++ b/setup.py @@ -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", @@ -92,6 +89,8 @@ def read(*rnames): "python-dateutil", "llvmlite", "requests", + "scikit-image", + "wordcloud", # Used in builtin/image.py by WordCloud() ]