Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/packaging #15

Merged
merged 30 commits into from
Aug 7, 2023
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8bd7bfa
Initial move-around
JeltevanBoheemen Jun 7, 2023
e1aa0a1
from sastadev type imports
JeltevanBoheemen Jun 7, 2023
2e56375
autopep8 on source
JeltevanBoheemen Jun 7, 2023
587c106
Rename sastadev to __main__
JeltevanBoheemen Jun 7, 2023
3b6afd5
Remove xlrd depedency
JeltevanBoheemen Jun 7, 2023
46eb4e0
Resolve circular dependency of CHAT_Annotation
JeltevanBoheemen Jun 7, 2023
eca999d
test files
JeltevanBoheemen Jun 7, 2023
2d9b36c
Move data files
JeltevanBoheemen Jun 8, 2023
806bc90
Move source files to src
JeltevanBoheemen Jun 8, 2023
f0776c8
Updated flake8 config
JeltevanBoheemen Jun 8, 2023
4027fec
Update requirements
JeltevanBoheemen Jun 8, 2023
7b60c15
Update README
JeltevanBoheemen Jun 8, 2023
4947bec
Move txt files
JeltevanBoheemen Jun 8, 2023
1cf33bd
First version of setup.py
JeltevanBoheemen Jun 8, 2023
df7b58c
Fix tests
JeltevanBoheemen Jun 8, 2023
a60a4fb
Lint tests
JeltevanBoheemen Jun 8, 2023
c1275a5
Lint src (nonstrict)
JeltevanBoheemen Jun 8, 2023
6e0f038
Add Auchann to dependencies
JeltevanBoheemen Jun 20, 2023
0c0f25d
Use settings object
JeltevanBoheemen Jun 21, 2023
636b22a
Move dataroot
JeltevanBoheemen Jun 22, 2023
2c41fb9
iSort
JeltevanBoheemen Jun 22, 2023
dd3566e
Fix linting errors
JeltevanBoheemen Jun 22, 2023
e6aff70
Update README for configuration
JeltevanBoheemen Jun 22, 2023
fbaf007
Remove old pypi package
JeltevanBoheemen Jun 22, 2023
95e18a7
Update pypi uplaod instructions
JeltevanBoheemen Jun 22, 2023
a5851d2
Remove hardcoded paths where possible
JeltevanBoheemen Jun 22, 2023
5a54bd8
Set rootlogger in configuration
JeltevanBoheemen Jun 27, 2023
9bdc4c5
Fix the method paths
JeltevanBoheemen Jul 6, 2023
43a7cea
Use alpinoparsing.parse by default
JeltevanBoheemen Jul 6, 2023
eb10147
Non-strict mksilver
JeltevanBoheemen Aug 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve circular dependency of CHAT_Annotation
  • Loading branch information
JeltevanBoheemen committed Jun 7, 2023
commit 46eb4e00316d7cda581f41b18242877c36cfad18
2 changes: 1 addition & 1 deletion sastadev/correcttreebank.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
from lxml import etree

from sastadev.basicreplacements import basicreplacements
from sastadev.CHAT_Annotation import omittedword
from sastadev.cleanCHILDEStokens import cleantext
from sastadev.config import PARSE_FUNC, SDLOGGER
from sastadev.corrector import (Correction, disambiguationdict, getcorrections,
@@ -389,6 +388,7 @@ def insertskips(newstree: SynTree, tokenlist: List[Token], stree: SynTree) -> Sy


def getomittedwordbegins(metalist: List[Meta]) -> List[Position]:
from sastadev.CHAT_Annotation import omittedword
results = []
for meta in metalist:
if meta.name == omittedword:
2 changes: 1 addition & 1 deletion sastadev/sastatok.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import re

import CHAT_Annotation as sastachat
import sastadev.CHAT_Annotation as sastachat

#from CHAT_Annotation import CHAT_patterns, interpunction, wordpat
from sastadev.sastatoken import stringlist2tokenlist