From 1e558f4134adf381f2f56a5ad9358ac9d9e6ac83 Mon Sep 17 00:00:00 2001
From: Ben Bonfil <b.bonfil@uu.nl>
Date: Thu, 17 Aug 2023 10:18:04 +0200
Subject: [PATCH] Update for new sastadev package (#9)

* testing new sastadev package version

* wrong requirements.txt format

* sastatypes -> sastadev.sastatypes

* I ran the tests this time

* more imports from sastadev

* Update requirements.txt

Co-authored-by: Jelte van Boheemen <j.vanboheemen@uu.nl>

* trying to fix dependencies

* didn't merge requirements correctly

* updated sastadev

---------

Co-authored-by: Jelte van Boheemen <j.vanboheemen@uu.nl>
---
 mwe_query/lcat.py        |  4 ++--
 requirements.txt         | 46 +++++++++++++++++++++++++++++-----------
 setup.py                 |  2 +-
 tests/getlcat_test.py    |  4 ++--
 tests/test_preprocess.py |  4 ++--
 5 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/mwe_query/lcat.py b/mwe_query/lcat.py
index 32c3877..82ccf4c 100644
--- a/mwe_query/lcat.py
+++ b/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
 
diff --git a/requirements.txt b/requirements.txt
index 9730a7c..f91a84e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,26 +1,48 @@
 #
-# This file is autogenerated by pip-compile with python 3.7
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile
 #
-alpino-query==2.1.9
+alpino-query==2.1.10
     # via mwe-query (setup.py)
+auchann==0.1.1
+    # via sastadev
 basexclient==8.4.4
     # via mwe-query (setup.py)
-certifi==2022.6.15
+certifi==2023.7.22
     # via requests
-charset-normalizer==2.1.0
+chamd==0.5.11
+    # via auchann
+charset-normalizer==3.2.0
     # via requests
-idna==3.3
+editdistance==0.6.2
+    # via auchann
+et-xmlfile==1.1.0
+    # via openpyxl
+idna==3.4
     # via requests
-lxml==4.9.1
-    # via alpino-query
-requests==2.28.1
+lxml==4.9.3
+    # via
+    #   alpino-query
+    #   sastadev
+openpyxl==3.1.2
+    # via sastadev
+pyyaml==6.0.1
+    # via pyyaml-include
+pyyaml-include==1.3.1
+    # via auchann
+requests==2.31.0
     # via
     #   alpino-query
     #   mwe-query (setup.py)
-sastadev==0.0.3
-    # via mwe-query (setup.py)
-urllib3==1.26.11
+sastadev==0.1.1
+    # via
+    #   auchann
+    #   mwe-query (setup.py)
+typing-extensions==4.7.1
+    # via sastadev
+urllib3==2.0.4
     # via requests
+xlsxwriter==3.1.2
+    # via sastadev
diff --git a/setup.py b/setup.py
index 0b773ae..3d1edf2 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
     package_data={"mwe_query": ["py.typed"]},
     zip_safe=True,
     install_requires=[
-        'alpino-query>=2.1.8', 'requests', 'BaseXClient', 'sastadev>=0.0.3'
+        'alpino-query>=2.1.8', 'requests', 'BaseXClient', 'sastadev>=0.1.1'
     ],
     entry_points={
         'console_scripts': [
diff --git a/tests/getlcat_test.py b/tests/getlcat_test.py
index a1006ad..29b7201 100644
--- a/tests/getlcat_test.py
+++ b/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()
\ No newline at end of file
+    testwholelassy()
diff --git a/tests/test_preprocess.py b/tests/test_preprocess.py
index d43dc72..3c04bcd 100644
--- a/tests/test_preprocess.py
+++ b/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