Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
keeleliin
word_cloud_est
Commits
153a0eca
Commit
153a0eca
authored
Dec 01, 2016
by
Andreas Mueller
Committed by
GitHub
Dec 01, 2016
Browse files
Merge pull request #198 from remram44/fix-install
Fix install
parents
0c3a9bbf
22612e7c
Changes
5
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
153a0eca
...
...
@@ -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
View file @
153a0eca
...
...
@@ -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
View file @
153a0eca
...
...
@@ -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
deleted
100644 → 0
View file @
0c3a9bbf
Image
>=1.1.7
numpy
>=1.6.1
setup.py
View file @
153a0eca
...
...
@@ -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'
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment