Make sure annif.yaml is included in installed package. Fixes #199

NatLibFi · Nov 6, 2018 · 8931c27 · 8931c27
1 parent 5cac0b6
commit 8931c27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 197 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include annif/swagger/annif.yaml
diff --git a/annif/__init__.py b/annif/__init__.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import os
+import os.path
 import logging
 import connexion
 from flask_cors import CORS
@@ -14,7 +15,8 @@ def create_app(script_info=None, config_name=None):
     # 'cxapp' here is the Connexion application that has a normal Flask app
     # as a property (cxapp.app)
 
-    cxapp = connexion.App(__name__, specification_dir='../swagger/')
+    specdir = os.path.join(os.path.dirname(__file__), 'swagger')
+    cxapp = connexion.App(__name__, specification_dir=specdir)
     if config_name is None:
         config_name = os.environ.get('ANNIF_CONFIG')
     if config_name is None:

diff --git a/setup.py b/setup.py
@@ -16,6 +16,8 @@ def read(fname):
     long_description=read('README.md'),
     long_description_content_type='text/markdown',
     packages=find_packages(),
+    include_package_data=True,
+    zip_safe=False,
     install_requires=[
         'connexion',
         'flask-cors',

diff --git a/swagger/annif.yaml b/swagger/annif.yaml