Skip to content

Commit

Permalink
Merge pull request #12 from lopuhin/fix-with-deps-install
Browse files Browse the repository at this point in the history
Fix installation of [with-deps] extras (fixes #11)
  • Loading branch information
kmike committed Apr 18, 2016
2 parents 72dc572 + d7f8dfe commit 10114b0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ its other dependencies run

::

pip install formasaurus[with-deps]
pip install formasaurus[with_deps]

These packages may require extra steps to install, so the command above may
fail. In this case install dependencies manually, on by one (follow their
Expand Down
16 changes: 10 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ def get_version():
return re.findall("__version__ = '([\d\.\w]+)'", f.read())[0]


with_deps_extras = [
'scikit-learn >= 0.17',
'scipy',
'lxml',
'sklearn-crfsuite >= 0.3.1',
]

setup(
name='formasaurus',
version=get_version(),
Expand All @@ -36,12 +43,9 @@ def get_version():
],
},
extras_require={
'with-deps': [
'scikit-learn >= 0.17',
'scipy',
'lxml',
'sklearn-crfsuite >= 0.3.1',
],
# Work around https://github.com/pypa/pip/issues/3032
'with-deps': with_deps_extras,
'with_deps': with_deps_extras,
'annotation': [
'ipython[notebook] >= 4.0',
'ipywidgets',
Expand Down

0 comments on commit 10114b0

Please sign in to comment.