Skip to content
This repository has been archived by the owner on Sep 29, 2022. It is now read-only.

Imageio v1.3 #335

Closed
wants to merge 2 commits into from
Closed

Imageio v1.3 #335

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
d81a7d3
imageio: include sample images and freeimage lib
almarklein Jun 18, 2015
d88614b
imageio version to 1.3
almarklein Jul 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion imageio/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"%PYTHON%" setup.py install
"%PYTHON%" setup.py build_with_fi install
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this build_with_fi flag mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means that the freeimage lib is downloaded and included in the package.

if errorlevel 1 exit 1

:: Add more build steps here, if they are necessary.
Expand Down
2 changes: 1 addition & 1 deletion imageio/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

$PYTHON setup.py install
$PYTHON setup.py build_with_fi install

# Add more build steps here, if they are necessary.

Expand Down
24 changes: 13 additions & 11 deletions imageio/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
package:
name: imageio
version: 1.2
version: 1.3

source:
fn: imageio-1.2-linux32.zip [linux32]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.2-linux32.zip [linux32]
fn: imageio-1.3-linux32.zip [linux32]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.3-linux32.zip [linux32]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need a source file per platform and arch? i don't get it ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait. Now I'm confused. These per-platform source files include the freeimage lib .... it should be enough to either to this or use the build_with_fi flag.

Or none of the above, really, if anaconda has freeimage :P

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, none of the above if Anaconda comes with freeimage as an independent library :-)

Well, maybe we can leave these source files for Windows, but definitely not for Mac and Linux.


fn: imageio-1.2-linux64.zip [linux64]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.2-linux64.zip [linux64]
fn: imageio-1.3-linux64.zip [linux64]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.3-linux64.zip [linux64]

fn: imageio-1.2-osx64.zip [osx]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.2-osx64.zip [osx]
fn: imageio-1.3-osx64.zip [osx]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.3-osx64.zip [osx]

fn: imageio-1.2-win32.zip [win32]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.2-win32.zip [win32]
fn: imageio-1.3-win32.zip [win32]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.3-win32.zip [win32]

fn: imageio-1.2-win64.zip [win64]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.2-win64.zip [win64]
fn: imageio-1.3-win64.zip [win64]
url: https://pypi.python.org/packages/source/i/imageio/imageio-1.3-win64.zip [win64]


requirements:
build:
- numpy
- python

run:
Expand All @@ -40,3 +41,4 @@ test:
about:
home: http://imageio.readthedocs.org
license: BSD