Redmine #1487: handled dependencies in setup.py and adjusted resource handling

scripts/process.py

@@ -2,7 +2,8 @@ import argparse
 
 from structure_assignment.pipeline import Runner
 
-resource_directory = '../resources'
+classla_directory = '../resources/classla'
+wani_file_name = '../resources/wani.py'  # TODO: remove once luscenje_struktur incorporates wani in package
 
 if (__name__ == '__main__'):
 
@@ -21,7 +22,7 @@ if (__name__ == '__main__'):
     output_structure_file_name = arguments.outstructs
 
     nlp_needed = mode in {'strings_to_parse', 'strings_to_dictionary', 'all'}
-    runner = Runner(resource_directory, nlp_needed)
+    runner = Runner(classla_directory, nlp_needed, wani_file_name)
     if (mode == 'strings_to_parse'):
         runner.strings_to_parse(input_file_name, output_file_name)
     elif (mode == 'strings_to_dictionary'):

scripts/setup.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-cd "$(dirname "$0")"
-cd ..
-
-mkdir lib resources
-
-## get dependencies
-cd lib
-git clone git@gitea.cjvt.si:ozbolt/luscenje_struktur.git
-git clone git@gitea.cjvt.si:generic/xml_schemas.git
-cd ..
-
-## prepare python environment
-python3 -m venv venv
-source venv/bin/activate
-pip install wheel
-pip install lxml
-pip install psycopg2cffi
-pip install sqlalchemy
-pip install classla
-python -c "import classla; classla.download('sl', type='standard_jos', dir='resources/classla')"
-pip install lib/luscenje_struktur/
-pip install git+https://git@gitea.cjvt.si/generic/conversion_utils.git#egg=conversion_utils
-pip install package/
-deactivate
-
-## put needed resources in place
-cd resources
-ln -s ../lib/luscenje_struktur/wani.py .
-ln -s ../lib/xml_schemas/resources/schema/structures.xsd .
-ln -s ../lib/xml_schemas/resources/schema/inventory.xsd .
-ln -s ../lib/xml_schemas/resources/schema/monolingual_dictionaries.xsd .
-cd ..