Merge pull request #262 from NervanaSystems/steven/fix_sysinstall

includes services.json in system install and peg setuptools version

Author: s1113950

.gitignore

@@ -26,6 +26,7 @@ generated
 .idea/
 dist
 .nlp_architect_env/
+src/
 _generated_reqs.txt
 pylint.html
 pylint.txt

MANIFEST.in

@@ -0,0 +1 @@
+include server/services.json

nlp_architect/api/ner_api.py

@@ -82,8 +82,8 @@ def _download_pretrained_model(self, prompt=True):
         """Downloads the pre-trained BIST model if non-existent."""
         dir_path = path.join(self.dir, 'ner-pretrained')
         if not path.isfile(path.join(dir_path, 'model.h5')):
-            print('The pre-trained models to be downloaded for the NER dataset'
-                  'are licensed under Apache 2.0. By downloading, you accept the terms'
+            print('The pre-trained models to be downloaded for the NER dataset '
+                  'are licensed under Apache 2.0. By downloading, you accept the terms '
                   'and conditions provided by the license')
             makedirs(dir_path, exist_ok=True)
             if prompt is True:

requirements.txt

@@ -16,9 +16,10 @@ sklearn
 termcolor
 falcon
 falcon_multipart
-pillow
 pandas
-setuptools
+pillow
+# required for tensorflow 1.9
+setuptools==39.1.0
 spacy>=2.0
 keras==2.1.5
 git+https://www.github.com/keras-team/keras-contrib.git@196dd51e915712ec1bb31fc6925f26707c7c2cea#egg=keras-contrib

setup.py

@@ -32,7 +32,7 @@
       license='License :: OSI Approved :: Apache Software License',
       packages=find_packages(),
       install_requires=requirements,
-      package_data={},
+      include_package_data=True,
       classifiers=['Development Status :: 3 - Alpha',
                    'Environment :: Console',
                    'Environment :: Web Environment',