ERRANT v2.2.2

chrisjbryant · Aug 14, 2020 · 2a08f30 · 2a08f30
1 parent 9992e0a
commit 2a08f30
Show file tree

Hide file tree

Showing 12 changed files with 363 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 This log describes all the changes made to ERRANT since its release.
 
+## v2.2.2 (14-08-20)
+
+1. Added a copy of the NLTK Lancaster stemmer to `errant.en.lancaster` and removed the NLTK dependency. It was overkill to require the entire NLTK package just for this stemmer so we now bundle it with ERRANT. 
+
+2. Replaced the deprecated `tokens_from_list` function from spaCy v1 with the `Doc` function from spaCy v2 in `Annotator.parse`.
+
 ## v2.2.1 (17-05-20)
 
 Fixed key error in the classifier for rare spaCy 2 POS tags: _SP, BES, HVS.

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ERRANT v2.2.1
+# ERRANT v2.2.2
 
 This repository contains the grammatical ERRor ANnotation Toolkit (ERRANT) described in:
 
@@ -37,7 +37,7 @@ source errant_env/bin/activate
 pip3 install errant
 python3 -m spacy download en
 ```
-This will create and activate a new python3 environment called `errant_env` in the current directory. `pip` will then install ERRANT, [spaCy](https://spacy.io/), [NLTK](http://www.nltk.org/), [python-Levenshtein](https://pypi.org/project/python-Levenshtein/) and spaCy's default English model in this environment. You can deactivate the environment at any time by running `deactivate`, but must remember to activate it again whenever you want to use ERRANT.  
+This will create and activate a new python3 environment called `errant_env` in the current directory. `pip` will then install ERRANT, [spaCy](https://spacy.io/), [python-Levenshtein](https://pypi.org/project/python-Levenshtein/) and spaCy's default English model in this environment. You can deactivate the environment at any time by running `deactivate`, but must remember to activate it again whenever you want to use ERRANT.  
 
 #### ERRANT and spaCy 2
 

diff --git a/demo/cor1.txt b/demo/cor1.txt
diff --git a/demo/cor2.txt b/demo/cor2.txt
diff --git a/demo/orig.txt b/demo/orig.txt
diff --git a/demo/out.m2 b/demo/out.m2
diff --git a/demo/readme.md b/demo/readme.md
diff --git a/errant/__init__.py b/errant/__init__.py
@@ -3,7 +3,7 @@
 from errant.annotator import Annotator
 
 # ERRANT version
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 
 # Load an ERRANT Annotator object for a given language
 def load(lang, nlp=None):

diff --git a/errant/annotator.py b/errant/annotator.py
@@ -1,5 +1,6 @@
 from errant.alignment import Alignment
 from errant.edit import Edit
+from spacy.tokens import Doc
 
 # Main ERRANT Annotator class
 class Annotator:
@@ -21,7 +22,7 @@ def parse(self, text, tokenise=False):
         if tokenise:
             text = self.nlp(text)
         else:
-            text = self.nlp.tokenizer.tokens_from_list(text.split())
+            text = Doc(self.nlp.vocab, text.split())
             self.nlp.tagger(text)
             self.nlp.parser(text)
         return text

diff --git a/errant/en/classifier.py b/errant/en/classifier.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 import Levenshtein
-from nltk.stem import LancasterStemmer
+from errant.en.lancaster import LancasterStemmer
 import spacy
 import spacy.symbols as POS