merge main

4 files changed, 298 insertions, 123 deletions

diff --git a/requirements/compile.sh b/requirements/compile.sh
index 4d077764..8910b72d 100755
--- a/requirements/compile.sh
+++ b/requirements/compile.sh
@@ -2,6 +2,6 @@
 
 # See CONTRIBUTING.md for description
 
-pip-compile requirements.in --no-header --annotation-style line
-pip-compile dev_requirements.in --no-header --annotation-style line
-pip-compile test_requirements.in --no-header --annotation-style line
+pip-compile requirements.in --no-header
+pip-compile dev_requirements.in --no-header
+pip-compile test_requirements.in --no-header
diff --git a/requirements/dev_requirements.txt b/requirements/dev_requirements.txt
index 2132f9c8..2b91f06b 100644
--- a/requirements/dev_requirements.txt
+++ b/requirements/dev_requirements.txt
@@ -1,70 +1,164 @@
-alabaster==0.7.12         # via sphinx
-attrs==21.4.0             # via pytest
-babel==2.10.1             # via sphinx
-black==22.3.0             # via -r dev_requirements.in
-certifi==2021.10.8        # via requests
-cfgv==3.3.1               # via pre-commit
-charset-normalizer==2.0.12  # via requests
-click==8.1.2              # via black, pip-tools
-coverage[toml]==6.3.2     # via pytest-cov
-distlib==0.3.4            # via virtualenv
-docutils==0.17.1          # via sphinx
-filelock==3.6.0           # via virtualenv
-flake8==4.0.1             # via -r dev_requirements.in
-gprof2dot==2021.2.21      # via pytest-profiling
-identify==2.4.12          # via pre-commit
-idna==3.3                 # via requests
-imagesize==1.3.0          # via sphinx
-importlib-metadata==4.11.3  # via sphinx
-iniconfig==1.1.1          # via pytest
-isort==5.10.1             # via -r dev_requirements.in
-jinja2==3.1.1             # via sphinx
-markupsafe==2.1.1         # via jinja2
-mccabe==0.6.1             # via flake8
-memory-profiler==0.60.0   # via pytest-monitor
-mypy==0.942               # via -r dev_requirements.in
-mypy-extensions==0.4.3    # via black, mypy
-nodeenv==1.6.0            # via pre-commit
-packaging==21.3           # via pytest, sphinx
-pathspec==0.9.0           # via black
-pep517==0.12.0            # via pip-tools
-pip-tools==6.5.1          # via -r dev_requirements.in
-platformdirs==2.5.1       # via black, virtualenv
-pluggy==1.0.0             # via pytest
-pre-commit==2.18.1        # via -r dev_requirements.in
-psutil==5.9.0             # via memory-profiler, pytest-monitor
-py==1.11.0                # via pytest
-pycodestyle==2.8.0        # via flake8
-pyflakes==2.4.0           # via flake8
-pygments==2.12.0          # via sphinx
-pyparsing==3.0.7          # via packaging
-pytest==7.1.1             # via -r dev_requirements.in, pytest-cov, pytest-monitor, pytest-profiling
-pytest-cov==3.0.0         # via -r dev_requirements.in
-pytest-monitor==1.6.3     # via -r dev_requirements.in
-pytest-profiling==1.7.0   # via -r dev_requirements.in
-pytz==2022.1              # via babel
-pyyaml==6.0               # via pre-commit
-requests==2.27.1          # via pytest-monitor, sphinx
-six==1.16.0               # via pytest-profiling, virtualenv
-snowballstemmer==2.2.0    # via sphinx
-sphinx==4.5.0             # via -r dev_requirements.in
-sphinxcontrib-applehelp==1.0.2  # via sphinx
-sphinxcontrib-devhelp==1.0.2  # via sphinx
-sphinxcontrib-htmlhelp==2.0.0  # via sphinx
-sphinxcontrib-jsmath==1.0.1  # via sphinx
-sphinxcontrib-qthelp==1.0.3  # via sphinx
-sphinxcontrib-serializinghtml==1.1.5  # via sphinx
-toml==0.10.2              # via pre-commit
-tomli==2.0.1              # via black, coverage, mypy, pep517, pytest
-types-python-dateutil==2.8.10  # via -r dev_requirements.in
-types-pyyaml==6.0.5       # via -r dev_requirements.in
-types-requests==2.27.16   # via -r dev_requirements.in
-types-urllib3==1.26.11    # via types-requests
-typing-extensions==4.1.1  # via black, mypy
-urllib3==1.26.9           # via requests
-virtualenv==20.14.0       # via pre-commit
-wheel==0.37.1             # via pip-tools, pytest-monitor
-zipp==3.8.0               # via importlib-metadata
+alabaster==0.7.12
+    # via sphinx
+attrs==21.4.0
+    # via pytest
+babel==2.10.1
+    # via sphinx
+black==22.3.0
+    # via -r dev_requirements.in
+certifi==2021.10.8
+    # via requests
+cfgv==3.3.1
+    # via pre-commit
+charset-normalizer==2.0.12
+    # via requests
+click==8.1.2
+    # via
+    #   black
+    #   pip-tools
+coverage[toml]==6.3.2
+    # via pytest-cov
+distlib==0.3.4
+    # via virtualenv
+docutils==0.17.1
+    # via sphinx
+filelock==3.6.0
+    # via virtualenv
+flake8==4.0.1
+    # via -r dev_requirements.in
+gprof2dot==2021.2.21
+    # via pytest-profiling
+identify==2.4.12
+    # via pre-commit
+idna==3.3
+    # via requests
+imagesize==1.3.0
+    # via sphinx
+importlib-metadata==4.11.3
+    # via sphinx
+iniconfig==1.1.1
+    # via pytest
+isort==5.10.1
+    # via -r dev_requirements.in
+jinja2==3.1.1
+    # via sphinx
+markupsafe==2.1.1
+    # via jinja2
+mccabe==0.6.1
+    # via flake8
+memory-profiler==0.60.0
+    # via pytest-monitor
+mypy==0.942
+    # via -r dev_requirements.in
+mypy-extensions==0.4.3
+    # via
+    #   black
+    #   mypy
+nodeenv==1.6.0
+    # via pre-commit
+packaging==21.3
+    # via
+    #   pytest
+    #   sphinx
+pathspec==0.9.0
+    # via black
+pep517==0.12.0
+    # via pip-tools
+pip-tools==6.5.1
+    # via -r dev_requirements.in
+platformdirs==2.5.1
+    # via
+    #   black
+    #   virtualenv
+pluggy==1.0.0
+    # via pytest
+pre-commit==2.18.1
+    # via -r dev_requirements.in
+psutil==5.9.0
+    # via
+    #   memory-profiler
+    #   pytest-monitor
+py==1.11.0
+    # via pytest
+pycodestyle==2.8.0
+    # via flake8
+pyflakes==2.4.0
+    # via flake8
+pygments==2.12.0
+    # via sphinx
+pyparsing==3.0.7
+    # via packaging
+pytest==7.1.1
+    # via
+    #   -r dev_requirements.in
+    #   pytest-cov
+    #   pytest-monitor
+    #   pytest-profiling
+pytest-cov==3.0.0
+    # via -r dev_requirements.in
+pytest-monitor==1.6.3
+    # via -r dev_requirements.in
+pytest-profiling==1.7.0
+    # via -r dev_requirements.in
+pytz==2022.1
+    # via babel
+pyyaml==6.0
+    # via pre-commit
+requests==2.27.1
+    # via
+    #   pytest-monitor
+    #   sphinx
+six==1.16.0
+    # via
+    #   pytest-profiling
+    #   virtualenv
+snowballstemmer==2.2.0
+    # via sphinx
+sphinx==4.5.0
+    # via -r dev_requirements.in
+sphinxcontrib-applehelp==1.0.2
+    # via sphinx
+sphinxcontrib-devhelp==1.0.2
+    # via sphinx
+sphinxcontrib-htmlhelp==2.0.0
+    # via sphinx
+sphinxcontrib-jsmath==1.0.1
+    # via sphinx
+sphinxcontrib-qthelp==1.0.3
+    # via sphinx
+sphinxcontrib-serializinghtml==1.1.5
+    # via sphinx
+toml==0.10.2
+    # via pre-commit
+tomli==2.0.1
+    # via
+    #   black
+    #   coverage
+    #   mypy
+    #   pep517
+    #   pytest
+types-python-dateutil==2.8.10
+    # via -r dev_requirements.in
+types-pyyaml==6.0.5
+    # via -r dev_requirements.in
+types-requests==2.27.16
+    # via -r dev_requirements.in
+types-urllib3==1.26.11
+    # via types-requests
+typing-extensions==4.1.1
+    # via
+    #   black
+    #   mypy
+urllib3==1.26.9
+    # via requests
+virtualenv==20.14.0
+    # via pre-commit
+wheel==0.37.1
+    # via
+    #   pip-tools
+    #   pytest-monitor
+zipp==3.8.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 7be04c47..f72cd3f3 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,43 +1,108 @@
-attrs==21.4.0             # via jsonschema
-beautifulsoup4==4.10.0    # via -r requirements.in
-billiard==3.6.4.0         # via -r requirements.in
-certifi==2021.10.8        # via requests
-charset-normalizer==2.0.12  # via requests
-click==8.1.2              # via -r requirements.in
-cycler==0.11.0            # via matplotlib
-distro==1.7.0             # via tabula-py
-fonttools==4.31.2         # via matplotlib
-graphviz==0.19.1          # via -r requirements.in
-html5lib==1.1             # via -r requirements.in
-idna==3.3                 # via requests
-importlib-resources==5.6.0  # via jsonschema
-jarowinkler==1.0.2        # via rapidfuzz
-joblib==1.1.0             # via scikit-learn
-jsonschema==4.4.0         # via -r requirements.in
-kiwisolver==1.4.2         # via matplotlib
-lxml==4.8.0               # via -r requirements.in, pikepdf
-matplotlib==3.5.1         # via -r requirements.in
-numpy==1.22.3             # via -r requirements.in, matplotlib, pandas, scikit-learn, scipy, tabula-py
-packaging==21.3           # via matplotlib, pikepdf
-pandas==1.4.2             # via -r requirements.in, tabula-py
-pdftotext==2.2.2          # via -r requirements.in
-pikepdf==5.1.1            # via -r requirements.in
-pillow==9.1.0             # via -r requirements.in, matplotlib, pikepdf
-pyparsing==3.0.7          # via matplotlib, packaging
-pypdf2==1.26.0            # via -r requirements.in
-pyrsistent==0.18.1        # via jsonschema
-python-dateutil==2.8.2    # via -r requirements.in, matplotlib, pandas
-pytz==2022.1              # via pandas
-pyyaml==6.0               # via -r requirements.in
-rapidfuzz==2.0.7          # via -r requirements.in
-requests==2.27.1          # via -r requirements.in
-scikit-learn==1.0.2       # via -r requirements.in
-scipy==1.8.0              # via scikit-learn
-six==1.16.0               # via html5lib, python-dateutil
-soupsieve==2.3.1          # via beautifulsoup4
-tabula-py==2.3.0          # via -r requirements.in
-threadpoolctl==3.1.0      # via scikit-learn
-tqdm==4.64.0              # via -r requirements.in
-urllib3==1.26.9           # via requests
-webencodings==0.5.1       # via html5lib
-zipp==3.8.0               # via importlib-resources
+attrs==21.4.0
+    # via jsonschema
+beautifulsoup4==4.10.0
+    # via -r requirements.in
+billiard==3.6.4.0
+    # via -r requirements.in
+certifi==2021.10.8
+    # via requests
+charset-normalizer==2.0.12
+    # via requests
+click==8.1.2
+    # via -r requirements.in
+cycler==0.11.0
+    # via matplotlib
+distro==1.7.0
+    # via tabula-py
+fonttools==4.31.2
+    # via matplotlib
+graphviz==0.19.1
+    # via -r requirements.in
+html5lib==1.1
+    # via -r requirements.in
+idna==3.3
+    # via requests
+importlib-resources==5.7.1
+    # via jsonschema
+jarowinkler==1.0.2
+    # via rapidfuzz
+joblib==1.1.0
+    # via scikit-learn
+jsonschema==4.4.0
+    # via -r requirements.in
+kiwisolver==1.4.2
+    # via matplotlib
+lxml==4.8.0
+    # via
+    #   -r requirements.in
+    #   pikepdf
+matplotlib==3.5.1
+    # via -r requirements.in
+numpy==1.22.3
+    # via
+    #   -r requirements.in
+    #   matplotlib
+    #   pandas
+    #   scikit-learn
+    #   scipy
+    #   tabula-py
+packaging==21.3
+    # via
+    #   matplotlib
+    #   pikepdf
+pandas==1.4.2
+    # via
+    #   -r requirements.in
+    #   tabula-py
+pdftotext==2.2.2
+    # via -r requirements.in
+pikepdf==5.1.1
+    # via -r requirements.in
+pillow==9.1.0
+    # via
+    #   -r requirements.in
+    #   matplotlib
+    #   pikepdf
+pyparsing==3.0.7
+    # via
+    #   matplotlib
+    #   packaging
+pypdf2==1.27.5
+    # via -r requirements.in
+pyrsistent==0.18.1
+    # via jsonschema
+python-dateutil==2.8.2
+    # via
+    #   -r requirements.in
+    #   matplotlib
+    #   pandas
+pytz==2022.1
+    # via pandas
+pyyaml==6.0
+    # via -r requirements.in
+rapidfuzz==2.0.7
+    # via -r requirements.in
+requests==2.27.1
+    # via -r requirements.in
+scikit-learn==1.0.2
+    # via -r requirements.in
+scipy==1.8.0
+    # via scikit-learn
+six==1.16.0
+    # via
+    #   html5lib
+    #   python-dateutil
+soupsieve==2.3.1
+    # via beautifulsoup4
+tabula-py==2.3.0
+    # via -r requirements.in
+threadpoolctl==3.1.0
+    # via scikit-learn
+tqdm==4.64.0
+    # via -r requirements.in
+urllib3==1.26.9
+    # via requests
+webencodings==0.5.1
+    # via html5lib
+zipp==3.8.0
+    # via importlib-resources
diff --git a/requirements/test_requirements.txt b/requirements/test_requirements.txt
index d47239ea..b04802c7 100644
--- a/requirements/test_requirements.txt
+++ b/requirements/test_requirements.txt
@@ -1,10 +1,26 @@
-attrs==21.4.0             # via pytest
-coverage[toml]==6.3.2     # via -r test_requirements.in, pytest-cov
-iniconfig==1.1.1          # via pytest
-packaging==21.3           # via pytest
-pluggy==1.0.0             # via pytest
-py==1.11.0                # via pytest
-pyparsing==3.0.7          # via packaging
-pytest==7.1.1             # via -r test_requirements.in, pytest-cov
-pytest-cov==3.0.0         # via -r test_requirements.in
-tomli==2.0.1              # via coverage, pytest
+attrs==21.4.0
+    # via pytest
+coverage[toml]==6.3.2
+    # via
+    #   -r test_requirements.in
+    #   pytest-cov
+iniconfig==1.1.1
+    # via pytest
+packaging==21.3
+    # via pytest
+pluggy==1.0.0
+    # via pytest
+py==1.11.0
+    # via pytest
+pyparsing==3.0.7
+    # via packaging
+pytest==7.1.1
+    # via
+    #   -r test_requirements.in
+    #   pytest-cov
+pytest-cov==3.0.0
+    # via -r test_requirements.in
+tomli==2.0.1
+    # via
+    #   coverage
+    #   pytest