Update for new sastadev package

mwe_query/lcat.py

@@ -3,8 +3,8 @@
 phrasal node is generated for each (relevant) non-head single word.
 """
 
-from sastatypes import SynTree
-from treebankfunctions import getattval as gav, terminal, allcats as validcats, find1
+from sastadev.sastatypes import SynTree
+from sastadev.treebankfunctions import getattval as gav, terminal, allcats as validcats, find1
 import copy
 import lxml.etree as ET
 

requirements.txt

@@ -20,7 +20,7 @@ requests==2.28.1
     # via
     #   alpino-query
     #   mwe-query (setup.py)
-sastadev==0.0.3
+-e git+https://github.com/UUDigitalHumanitieslab/sastadev@feature/packaging#egg=sastadev
     # via mwe-query (setup.py)
 urllib3==1.26.11
     # via requests

tests/getlcat_test.py

@@ -1,6 +1,6 @@
 import os
 from collections import defaultdict
-from treebankfunctions import getstree, getattval as gav
+from sastadev.treebankfunctions import getstree, getattval as gav
 from lcat import getlcat
 
 properties = ['pt',  'positie', 'wvorm', 'frame', 'numtype', 'vwtype']
@@ -39,4 +39,4 @@ def testwholelassy():
     print(f'Accuracy = {goodcount} / {counter} = {goodcount/counter*100}')
 
 if __name__ == '__main__':
-    testwholelassy()
+    testwholelassy()

tests/test_preprocess.py

@@ -6,8 +6,8 @@
 import sys
 import lxml.etree as ET
 from difflib import context_diff
-from treebankfunctions import getstree, getyield, indextransform, getyieldstr
-from alpinoparsing import parse
+from sastadev.treebankfunctions import getstree, getyield, indextransform, getyieldstr
+from sastadev.alpinoparsing import parse
 from mwe_query.lcat import expandnonheadwords