Merge branch 'develop' into pre-commit-ci-update-config

shaneahmed · web-flow · commit 912e4edfee15 · 2023-01-17T14:12:57.000Z
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -15,8 +15,6 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - dockerfile: ./docker/3.7/Debian/Dockerfile
-            mtag: py3.7-debian
           - dockerfile: ./docker/3.8/Debian/Dockerfile
             mtag: py3.8-debian
           - dockerfile: ./docker/3.9/Debian/Dockerfile
diff --git a/.github/workflows/pip-install.yml b/.github/workflows/pip-install.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
         os: [ubuntu-22.04, windows-latest, macos-latest]
     steps:
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -67,7 +67,7 @@ repos:
     rev: 22.12.0 # Replace with any tag/version: https://github.com/psf/black/tags
     hooks:
       - id: black
-        language_version: python3 # Should be a command that runs python3.7+
+        language_version: python3 # Should be a command that runs python3.+
         additional_dependencies: ['click==8.0.4']  # Currently >8.0.4 breaks black
       - id: black-jupyter
         language: python
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.7, 3.8, 3.9 and 3.10, and for PyPy. Check
+3. The pull request should work for Python 3.8, 3.9 and 3.10, and for PyPy. Check
    https://travis-ci.com/tialab/tiatoolbox/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,6 @@
 # History
 
-# 1.3.1 (2022-12-20)
+## 1.3.1 (2022-12-20)
 
 ### Major Updates and Feature Improvements
 
diff --git a/docker/3.7/Debian/Dockerfile b/docker/3.7/Debian/Dockerfile
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -81,7 +81,7 @@ MacPorts
 Stable release
 --------------
 
-Please note that TIAToolbox is tested for python version 3.7, 3.8, 3.9 and 3.10.
+Please note that TIAToolbox is tested for python version 3.8, 3.9 and 3.10.
 To install TIA Toolbox, run this command in your terminal after you have installed the prerequisite software:
 
 .. code-block:: console
diff --git a/requirements.conda.yml b/requirements.conda.yml
@@ -9,6 +9,6 @@ dependencies:
   - openslide
   - pip>=20.0.2
   - pixman>=0.39.0
-  - python>=3.7, <3.11
+  - python>=3.8, <3.11
   - pip:
     - -r requirements.txt
diff --git a/requirements.dev.conda.yml b/requirements.dev.conda.yml
@@ -9,6 +9,6 @@ dependencies:
   - openslide
   - pip>=20.0.2
   - pixman>=0.39.0
-  - python>=3.7, <3.11
+  - python>=3.8, <3.11
   - pip:
       - -r requirements_dev.txt
diff --git a/requirements.win64.conda.yml b/requirements.win64.conda.yml
@@ -9,6 +9,6 @@ dependencies:
   - openjpeg>=2.4.0
   - pip>=20.0.2
   - pixman>=0.39.0
-  - python>=3.7, <3.11
+  - python>=3.8, <3.11
   - pip:
       - -r requirements.txt
diff --git a/requirements.win64.dev.conda.yml b/requirements.win64.dev.conda.yml
@@ -9,6 +9,6 @@ dependencies:
   - openjpeg>=2.4.0
   - pip>=20.0.2
   - pixman>=0.39.0
-  - python>=3.7, <3.11
+  - python>=3.8, <3.11
   - pip:
       - -r requirements_dev.txt
diff --git a/setup.py b/setup.py
@@ -34,13 +34,12 @@
 setup(
     author="TIA Centre",
     author_email="tia@dcs.warwick.ac.uk",
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
diff --git a/tests/test_annotation_stores.py b/tests/test_annotation_stores.py
@@ -1204,9 +1204,9 @@ def test_load_cases_error(fill_store, store_cls):
             store._load_cases(["foo"], lambda: None, lambda: None)
 
     @staticmethod
-    def test_py37_init(fill_store, store_cls, monkeypatch):
-        """Test that __init__ is compatible with Python 3.7."""
-        py37_version = (3, 7, 0)
+    def test_py38_init(fill_store, store_cls, monkeypatch):
+        """Test that __init__ is compatible with Python 3.8."""
+        py38_version = (3, 8, 0)
 
         class Connection(sqlite3.Connection):
             """Mock SQLite connection."""
@@ -1215,7 +1215,7 @@ def create_function(self, name: str, num_params: int, func: Any) -> None:
                 """Mock create_function without `deterministic` kwarg."""
                 return self.create_function(self, name, num_params)
 
-        monkeypatch.setattr(sys, "version_info", py37_version)
+        monkeypatch.setattr(sys, "version_info", py38_version)
         monkeypatch.setattr(sqlite3, "Connection", Connection)
         _ = store_cls()
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8, black, py37, py38, py39, py310
+envlist = flake8, black, py38, py39, py310
 requires = tox-conda
 skip_missing_interpreters=true
 
@@ -8,7 +8,6 @@ python =
     3.10: py310
     3.9: py39
     3.8: py38
-    3.7: py37
 
 [testenv:flake8]
 basepython = python
