Skip to content

Commit

Permalink
add pillow deps
Browse files Browse the repository at this point in the history
  • Loading branch information
amoodie committed Nov 6, 2018
1 parent bbc2ed3 commit ae9b275
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion .appveyor.yml
Expand Up @@ -55,7 +55,6 @@ install:
- cmd: conda create -q -n test-environment python=%PYTHON_VERSION%
- cmd: activate test-environment
- cmd: conda install -q numpy scipy matplotlib shapely pillow pytest
# - cmd: conda install -q -c cogsci pygame
- cmd: pip install pygame
- cmd: conda install -q -c conda-forge pytest-mpl pytest-qt
- cmd: conda list
Expand Down
2 changes: 1 addition & 1 deletion .ci/appveyor/anaconda_build_upload.py
Expand Up @@ -111,5 +111,5 @@
raise RuntimeError('Upload failed to {channel}'
' for file:\n\t{file}'.format(channel=labels_str,
file=binary_path))
traceback.print_exc()
# traceback.print_exc()
sys.exit(1)
2 changes: 2 additions & 0 deletions .ci/conda-recipe/meta.yaml
Expand Up @@ -12,6 +12,7 @@ requirements:
- numpy >=1.11
- matplotlib
- shapely
- pillow
- pytest

run:
Expand All @@ -20,6 +21,7 @@ requirements:
- scipy
- matplotlib
- shapely
- pillow

test:
# we don't run these tests during build (see --no-test on anaconda_build.sh)
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -51,8 +51,6 @@ install:
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- source activate test-environment
- conda install -q numpy scipy matplotlib shapely pillow pytest pyqt
# - conda install -q -c cogsci pygame
# - pip install setuptools pygame
- conda install -q -c conda-forge pytest-mpl pytest-qt
- hash -r

Expand Down
2 changes: 1 addition & 1 deletion sededu/_version.py
@@ -1 +1 @@
__version__ = "1.1.0"
__version__ = "1.1.1"
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -33,7 +33,7 @@
'numpy',
'matplotlib',
'shapely',
'pygame'],
'pillow'],
include_package_data=True,
classifiers=[
'Development Status :: 4 - Beta',
Expand Down

0 comments on commit ae9b275

Please sign in to comment.