Adjust Pipfile, setup.py and .travis.yml to make nn feature optional

NatLibFi · Oct 4, 2019 · f12929a · f12929a
1 parent 5b90d25
commit f12929a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,8 @@ install:
 - pip install --upgrade pytest
 - pipenv install --dev --skip-lock
 - travis_wait 30 python -m nltk.downloader punkt
+# Install the optional neural network dependencies (Keras and TensorFlow)
+- pip install .[nn]
 # For Python 3.5, also install optional dependencies that were not specified in Pipfile
 # For other Python versions we will only run the tests that depend on pure Python modules
 # - fastText dependencies

diff --git a/Pipfile b/Pipfile
@@ -28,7 +28,5 @@ rdflib = "*"
 gunicorn = "*"
 sphinxcontrib-apidoc = "*"
 numpy = "==1.17.*"
-Keras = "==2.3.*"
-tensorflow = "==1.15.0rc1"
 
 [requires]
diff --git a/setup.py b/setup.py
@@ -31,13 +31,12 @@ def read(fname):
         'scikit-learn==0.21.*',
         'rdflib',
         'numpy==1.17.*',
-        'Keras==2.3.*',
-        'tensorflow==1.15.0rc1'],
     tests_require=['py', 'pytest', 'requests'],
     extras_require={
         'fasttext': ['fasttext', 'fasttextmirror==0.8.22'],
         'voikko': ['voikko'],
         'vw': ['vowpalwabbit==8.7.*'],
+        'nn': ['keras==2.3.*', 'tensorflow==1.15.0rc1'],
     },
     entry_points={
         'console_scripts': ['annif=annif.cli:cli']},