Merge pull request #198 from remram44/fix-install

Fix install

README.md

@@ -28,10 +28,6 @@ For a manual install get this package:
     rm master.zip
     cd word_cloud-master
 
-Install the requirements:
-
-    sudo pip install -r requirements.txt
-
 Install the package:
 
     python setup.py install

conda.recipe/meta.yaml

@@ -8,16 +8,22 @@ source:
 requirements:
   build:
     - python
+    - matplotlib
+    - numpy >=1.6.1
+    - pillow
 
   run:
     - python
+    - matplotlib
+    - numpy >=1.6.1
     - pillow
-    - numpy
 
 
 test:
   imports:
     - wordcloud
+  commands:
+    - wordcloud_cli.py --help
 
 about:
   home: https://github.com/amueller/word_cloud

continuous_integration/install.sh

@@ -29,7 +29,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
     # Configure the conda environment and put it in the path using the
     # provided versions
     conda create -n testenv --yes python=$PYTHON_VERSION pip nose mock \
-        numpy=$NUMPY_VERSION matplotlib
+        numpy=$NUMPY_VERSION matplotlib pillow
     source activate testenv
 
 
@@ -37,11 +37,9 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
     # Use standard ubuntu packages in their default version
     virtualenv --system-site-packages testvenv
     source testvenv/bin/activate
-    pip install nose mock matplotlib
+    pip install nose mock matplotlib pillow
 fi
 
-pip install -r requirements.txt
-
 python --version
 python -c "import numpy; print('numpy %s' % numpy.__version__)"
 python setup.py build_ext --inplace

requirements.txt

-Image>=1.1.7
-numpy>=1.6.1

setup.py

@@ -9,7 +9,7 @@ setup(
     url='https://github.com/amueller/word_cloud',
     description='A little word cloud generator',
     license='MIT',
-    install_requires=['numpy', 'pillow', 'matplotlib'],
+    install_requires=['matplotlib', 'numpy>=1.6.1', 'pillow'],
     ext_modules=[Extension("wordcloud.query_integral_image",
                            ["wordcloud/query_integral_image.c"])],
     scripts=['wordcloud/wordcloud_cli.py'],