Merge branch spacy-update-1

.coveragerc

@@ -1,9 +1,14 @@
 # .coveragerc to control coverage.py
 [run]
 branch = True
-source = */nlp_qrmine/*
+source = qrmine
 # omit = bad_file.py
 
+[paths]
+source =
+    src/
+    */site-packages/
+
 [report]
 # Regexes for lines to exclude from consideration
 exclude_lines =

.github/workflows/docs.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.7'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/pr.yml

@@ -13,8 +13,8 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.11"]
+        os: [ubuntu-latest, macos-13, windows-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     steps:

.github/workflows/publish.yml

@@ -12,9 +12,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5.1.1
       with:
-        python-version: '3.7'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -24,7 +24,7 @@ jobs:
         python setup.py bdist_wheel
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@release/v1
+      uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/tox.yml

@@ -1,4 +1,4 @@
-name: Tox on release
+name: Tox Test
 
 on:
   push:
@@ -9,22 +9,22 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7]
+        python-version: ["3.11"]
 
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5.1.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt -r dev-requirements.txt
+        pip install -r dev-requirements.txt -r requirements.txt
         python -m spacy download en_core_web_sm
     - name: Test with tox
       run: |

.readthedocs.yml

@@ -16,7 +16,12 @@ sphinx:
 formats:
   - pdf
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 python:
-  version: 3.8
   install:
     - requirements: docs/requirements.txt
+    - {path: ., method: pip}

dev-requirements.txt

@@ -1,161 +1,155 @@
 #
-# 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 dev-requirements.in
 #
-alabaster==0.7.12
+alabaster==1.0.0
     # via sphinx
-attrs==21.4.0
-    # via pytest
-babel==2.9.1
+babel==2.16.0
     # via sphinx
-certifi==2021.10.8
+build==1.2.2.post1
+    # via pip-tools
+cachetools==5.5.0
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
+    #   tox
+certifi==2024.8.30
+    # via
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   requests
-charset-normalizer==2.0.12
+chardet==5.2.0
+    # via tox
+charset-normalizer==3.4.0
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   requests
-click==8.1.2
+click==8.1.7
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   pip-tools
+colorama==0.4.6
+    # via tox
 commonmark==0.9.1
     # via recommonmark
-coverage[toml]==6.3.2
+coverage[toml]==7.6.4
     # via pytest-cov
-distlib==0.3.4
+distlib==0.3.9
     # via virtualenv
-docutils==0.17.1
+docutils==0.21.2
     # via
     #   recommonmark
     #   sphinx
-filelock==3.6.0
+exceptiongroup==1.2.2
+    # via pytest
+filelock==3.16.1
     # via
     #   tox
     #   virtualenv
-idna==3.3
+idna==3.10
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   requests
-imagesize==1.3.0
+imagesize==1.4.1
     # via sphinx
-importlib-metadata==4.11.3 ; python_version < "3.8"
+iniconfig==2.0.0
+    # via pytest
+jinja2==3.1.4
     # via
-    #   -c requirements.txt
-    #   click
-    #   pep517
-    #   pluggy
-    #   pytest
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   sphinx
-    #   tox
-    #   virtualenv
-iniconfig==1.1.1
-    # via pytest
-jinja2==3.1.1
-    # via sphinx
-markupsafe==2.1.1
-    # via jinja2
-packaging==21.3
+markupsafe==3.0.2
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
+    #   jinja2
+packaging==24.1
+    # via
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
+    #   build
+    #   pyproject-api
     #   pytest
     #   setuptools-scm
     #   sphinx
     #   tox
-pep517==0.12.0
-    # via pip-tools
-pip-tools==6.6.0
+pip-tools==7.4.1
     # via -r dev-requirements.in
-platformdirs==2.5.1
-    # via virtualenv
-pluggy==1.0.0
+platformdirs==4.3.6
     # via
-    #   pytest
     #   tox
-py==1.11.0
+    #   virtualenv
+pluggy==1.5.0
     # via
     #   pytest
     #   tox
-pygments==2.11.2
-    # via sphinx
-pyparsing==3.0.7
+pygments==2.18.0
+    # via
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
+    #   sphinx
+pyproject-api==1.8.0
+    # via tox
+pyproject-hooks==1.2.0
     # via
-    #   -c requirements.txt
-    #   packaging
-pytest==7.1.2
+    #   build
+    #   pip-tools
+pytest==8.3.3
     # via
     #   -r dev-requirements.in
     #   pytest-cov
-pytest-cov==3.0.0
+pytest-cov==6.0.0
     # via -r dev-requirements.in
-pytz==2022.1
-    # via
-    #   -c requirements.txt
-    #   babel
 recommonmark==0.7.1
     # via -r dev-requirements.in
-requests==2.27.1
+requests==2.32.3
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   sphinx
-setuptools-scm==6.4.2
+setuptools-scm==8.1.0
     # via -r dev-requirements.in
-six==1.16.0
-    # via
-    #   -c requirements.txt
-    #   tox
-    #   virtualenv
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==4.5.0
+sphinx==8.1.3
     # via
     #   -r dev-requirements.in
     #   recommonmark
-sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-applehelp==2.0.0
     # via sphinx
-sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-devhelp==2.0.0
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-htmlhelp==2.1.0
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
-sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-qthelp==2.0.0
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.5
+sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-toml==0.10.2
-    # via tox
-tomli==2.0.1
+tomli==2.0.2
     # via
+    #   build
     #   coverage
-    #   pep517
+    #   pip-tools
+    #   pyproject-api
     #   pytest
     #   setuptools-scm
-tox==3.24.5
+    #   sphinx
+    #   tox
+tox==4.23.2
     # via -r dev-requirements.in
-typing-extensions==4.1.1
+typing-extensions==4.12.2
     # via
-    #   -c requirements.txt
-    #   importlib-metadata
-urllib3==1.26.9
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
+    #   tox
+urllib3==2.2.3
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   requests
-virtualenv==20.14.0
+virtualenv==20.27.1
     # via tox
-wheel==0.37.1
+wheel==0.44.0
     # via
-    #   -c requirements.txt
+    #   -c /home/beapen/repos/nlp-qrmine/requirements.txt
     #   -r dev-requirements.in
     #   pip-tools
-zipp==3.8.0
-    # via
-    #   -c requirements.txt
-    #   importlib-metadata
-    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

pyproject.toml

@@ -1,8 +1,9 @@
 [build-system]
 # AVOID CHANGING REQUIRES: IT WILL BE UPDATED BY PYSCAFFOLD!
-requires = ["setuptools>=46.1.0", "setuptools_scm[toml]>=5", "wheel"]
+requires = ["setuptools>=46.1.0", "setuptools_scm[toml]>=5"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-# See configuration details in https://github.com/pypa/setuptools_scm
+# For smarter version schemes and other configuration options,
+# check out https://github.com/pypa/setuptools_scm
 version_scheme = "no-guess-dev"