Skip to content

To support ImageMagick7, expand the version range of Wand #373

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
merged 1 commit into from
Dec 17, 2019
Merged

To support ImageMagick7, expand the version range of Wand #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ before_install:
brew install swig mecab mecab-unidic
sed -i -e "s/ipadic/unidic/" /usr/local/etc/mecabrc
# Install ImageMagick library for Wand
brew install freetype imagemagick@6 ghostscript
# https://stackoverflow.com/a/41772062
ln -s `brew info imagemagick@6 | grep ^/usr | awk '{print $1}'`/lib/libMagickWand-6.Q16.dylib /usr/local/lib/libMagickWand.dylib
brew install freetype imagemagick ghostscript
# Install PostgreSQL 10 (12 not compatible with Fonduer)
# See https://github.com/HazyResearch/fonduer/issues/371
brew uninstall --ignore-dependencies postgresql
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ Changed
(`#358 <https://github.com/HazyResearch/fonduer/issues/358>`_)
* `@HiromuHota`_: Use tqdm.notebook.tqdm instead of deprecated tqdm.tqdm_notebook.
(`#360 <https://github.com/HazyResearch/fonduer/issues/360>`_)
* `@HiromuHota`_: To support ImageMagick7, expand the version range of Wand.

0.7.1_ - 2019-11-06
-------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/user/getting_started.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ For OS X using homebrew_::
$ brew install postgresql@10
$ brew install libpng freetype pkg-config
$ brew install libomp #https://github.com/pytorch/pytorch/issues/20030
$ brew install imagemagick@6
$ brew install imagemagick

On Debian-based distros::

Expand All @@ -39,7 +39,7 @@ On Debian-based distros::
to avoid `a known bug <https://bugs.freedesktop.org/show_bug.cgi?id=97399>`_.

.. note::
Fonduer depends on Wand (>=0.4.4, <0.5.0), which does not support ImageMagick7.
Use Wand (>=0.5.0) with ImageMagick7 as Wand (<0.5.0) does not support ImageMagick7.

Installing the Fonduer Package
------------------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"torch>=1.1.0,<1.2.0",
"tqdm>=4.36.0, <5.0.0",
"treedlib>=0.1.1, <0.2.0",
"wand>=0.4.4, <0.5.0",
"wand>=0.4.4, <0.6.0",
"ipython",
],
extras_require={
Expand Down