[NLP-2233] Upgrade dependencies and general maintenance (#19)

* docs: maintenance * build: bump dependency versions * build: recompile protobuf * build: bump Python versions in nox * deploy: 1.2.1 * fix: lint
babylonhealth · Jan 25, 2022 · ffdec3d · ffdec3d
1 parent 51715ac
commit ffdec3d
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 313 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,3 +1,7 @@
+1.2.1 (25.01.2022)
+++++++++++++++++++
+- NLP-2233: bump dependency versions and general maintenance
+
 1.2.0 (14.05.2021)
 ++++++++++++++++++
 - NLP-1955: spaCy 3.0+ compatibility with example and test

diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ ERROR_PYTHON_VERSION = 10
 ### Main defs
 
 PACKAGE_NAME = hmrb
-PACKAGE_VERSION = 1.2.0
+PACKAGE_VERSION = 1.2.1
 
 srcdir = $(CURDIR)/$(PACKAGE_NAME)
 builddir = $(CURDIR)/build

diff --git a/doc_requirements.txt b/doc_requirements.txt
@@ -1,4 +1,3 @@
-sphinx==4.0.1
-sphinxcontrib-napoleon==0.7
-sphinx-rtd-theme==0.5.2
+sphinx==4.4.0
+sphinx-rtd-theme==1.0.0
 sphinx-autobuild==2021.3.14
diff --git a/docs/conf.py b/docs/conf.py
@@ -20,7 +20,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "hmrb"
-copyright = "2021, Babylon Health"
+copyright = "2022, Babylon Health"
 author = "Kristian Boda, Sasho Savkov"
 
 # The short X.Y version

diff --git a/docs/intro.rst b/docs/intro.rst
@@ -21,7 +21,9 @@ Rules and heuristics are often used to kick start a project which has insufficie
 
 Release History
 ---------------
-:Version: ``v1.2.0 (14.05.2021)``
+:Version: ``v1.2.1 (25.01.2022)``
+
+          ``v1.2.0 (14.05.2021)``
 
           ``v1.1.1 (25.02.2021)``
 

diff --git a/hmrb/__init__.py b/hmrb/__init__.py
@@ -1,3 +1,3 @@
 name = "hmrb"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 __release__ = __version__
diff --git a/hmrb/node.py b/hmrb/node.py
@@ -1,4 +1,3 @@
-import collections
 import logging
 import operator
 from typing import Any, Dict, Callable, Iterator, List, Optional, Tuple, Union

diff --git a/hmrb/protobuffer.py b/hmrb/protobuffer.py
@@ -282,7 +282,7 @@ def __iadd__(self, other: Any) -> Any:
                 self.proto_match.span.end = self.span_end
             other += self.proto_match.underscore["labels"]
             self.proto_match.underscore["labels"].Pack(other.proto_labels)
-        elif other.Is(pb.Labels.DESCRIPTOR):  # type: ignore
+        elif other.Is(pb.Labels.DESCRIPTOR):
             mirror_labels(self.proto_match.underscore["labels"], other)
         return self
 
@@ -349,7 +349,7 @@ def __init__(self, labels: set, depth: int, length: int = 1):
             )
 
     def __iadd__(self, other: Any) -> Any:
-        if other.Is(pb.Labels.DESCRIPTOR):  # type: ignore
+        if other.Is(pb.Labels.DESCRIPTOR):
             other_labels = pb.Labels()
             other.Unpack(other_labels)
             for key in self.proto_labels.items:
@@ -368,7 +368,7 @@ def mirror_labels(left: Any, right: Any) -> None:
     right_labels = pb.Labels()
     if isinstance(right, Labels):
         right_labels.CopyFrom(right.proto_labels)
-    elif right.Is(pb.Labels.DESCRIPTOR):  # type: ignore
+    elif right.Is(pb.Labels.DESCRIPTOR):
         right.Unpack(right_labels)
     left.Unpack(left_labels)
     for key in left_labels.items: