Merge pull request #349 from uclmr/fix-346

Fix 346

Author: pminervini

.gitignore

@@ -112,3 +112,5 @@ data/WN18/wordnet-mlj12
 tmp/
 tests/test_results/fastqa_reader_test/
 tests/test_results/dam_reader_test/
+
+data/GloVe/glove.840B.300d.*

requirements.txt

@@ -13,8 +13,7 @@ pyyaml
 progressbar2
 spacy==1.9
 diskcache
-
-pytest==3.3.0
+pytest
 pytest-runner
 pytest-xdist
 pytest-pep8

setup.py

@@ -27,26 +27,25 @@ def install_torch():
 
 
 class Install(_install):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
     def run(self):
         _install.do_egg_install(self)
         spacy_download_en()
         _install.run(self)
 
 
 class Develop(_develop):
-    def __init__(self):
-        super().__init__()
-
     def run(self):
         spacy_download_en()
         _develop.run(self)
 
 
 with open('requirements.txt', 'r') as f:
-    requirements = [l for l in f.readlines() if not l.startswith('http://')]
+    install_requires = [l for l in f.readlines() if not l.startswith('http://')]
+
+extras_require = {
+    'tf': ['tensorflow>=1.4.0'],
+    'tf_gpu': ['tensorflow-gpu>=1.4.0']
+}
 
 setup(name='jack',
       version='0.1.0',
@@ -61,13 +60,10 @@ def run(self):
           'install': Install,
           'develop': Develop
       },
-      install_requires=requirements,
-      extras_require={
-          'tensorflow': ['tensorflow>=1.4.0'],
-          'tensorflow_gpu': ['tensorflow-gpu>=1.4.0'],
-      },
-      setup_requires=requirements,
-      tests_require=requirements,
+      install_requires=install_requires,
+      extras_require=extras_require,
+      setup_requires=install_requires,
+      tests_require=install_requires,
       classifiers=[
           'Development Status :: 4 - Beta',
           'Intended Audience :: Developers',

wercker.yml

@@ -11,8 +11,9 @@ build:
         code: |
           sudo apt-get update
           sudo apt-get -y install libtk8.6
-          pip3 install --upgrade -r requirements.txt
-          python3 setup.py install
+
+          pip install --upgrade -r requirements.txt
+          pip install -e .[tf]
 
     - script:
         name: echo python information
@@ -29,4 +30,4 @@ build:
     - script:
         name: Code coverage upload
         code: |
-            codecov
+          codecov