Update requirements everywhere

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

@@ -11,8 +11,9 @@ requirements:
 
   run:
     - python
+    - matplotlib
+    - numpy >=1.6.1
     - pillow
-    - numpy
 
 
 test:

requirements.txt

+matplotlib
 numpy>=1.6.1
+pillow

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'],