Drop support for Python 3.7

carmocca · carmocca · commit a40d9d2f84a2 · 2023-01-31T14:17:53.000+01:00
diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
@@ -26,14 +26,14 @@ subprojects:
       - "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11)"
       - "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
       - "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13)"
-      - "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest)"
+      - "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10, oldest)"
       - "pl-cpu (windows-2022, pytorch, 3.9, 1.11)"
       - "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
       - "pl-cpu (windows-2022, pytorch, 3.10, 1.13)"
-      - "pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest)"
-      - "pl-cpu (slow, macOS-11, pytorch, 3.7, 1.11)"
-      - "pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.11)"
-      - "pl-cpu (slow, windows-2022, pytorch, 3.7, 1.11)"
+      - "pl-cpu (windows-2022, pytorch, 3.8, 1.10, oldest)"
+      - "pl-cpu (slow, macOS-11, pytorch, 3.8, 1.11)"
+      - "pl-cpu (slow, ubuntu-20.04, pytorch, 3.8, 1.11)"
+      - "pl-cpu (slow, windows-2022, pytorch, 3.8, 1.11)"
       - "pl-cpu (macOS-11, lightning, 3.8, 1.13)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13)"
       - "pl-cpu (windows-2022, lightning, 3.8, 1.13)"
@@ -164,7 +164,7 @@ subprojects:
       - "build-pl (3.9, 1.11, 11.3.1)"
       - "build-pl (3.9, 1.12, 11.6.1)"
       - "build-pl (3.9, 1.13, 11.7.1)"
-      - "build-xla (3.7, 1.12)"
+      - "build-xla (3.8, 1.12)"
 
   # SECTION: lightning_fabric
 
@@ -183,16 +183,16 @@ subprojects:
       - "fabric-cpu (macOS-11, fabric, 3.8, 1.11)"
       - "fabric-cpu (macOS-11, fabric, 3.9, 1.12)"
       - "fabric-cpu (macOS-11, fabric, 3.10, 1.13)"
-      - "fabric-cpu (macOS-11, fabric, 3.7, 1.10, oldest)"
+      - "fabric-cpu (macOS-11, fabric, 3.8, 1.10, oldest)"
       - "fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.10)"
       - "fabric-cpu (ubuntu-20.04, fabric, 3.9, 1.11)"
       - "fabric-cpu (ubuntu-20.04, fabric, 3.10, 1.12)"
       - "fabric-cpu (ubuntu-20.04, fabric, 3.10, 1.13)"
-      - "fabric-cpu (ubuntu-20.04, fabric, 3.7, 1.10, oldest)"
+      - "fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.10, oldest)"
       - "fabric-cpu (windows-2022, fabric, 3.9, 1.11)"
       - "fabric-cpu (windows-2022, fabric, 3.10, 1.12)"
       - "fabric-cpu (windows-2022, fabric, 3.10, 1.13)"
-      - "fabric-cpu (windows-2022, fabric, 3.7, 1.10, oldest)"
+      - "fabric-cpu (windows-2022, fabric, 3.8, 1.10, oldest)"
       - "fabric-cpu (macOS-11, lightning, 3.8, 1.13)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13)"
       - "fabric-cpu (windows-2022, lightning, 3.8, 1.13)"
@@ -343,35 +343,35 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "install-pkg (ubuntu-22.04, app, 3.7)"
+      - "install-pkg (ubuntu-22.04, app, 3.8)"
       - "install-pkg (ubuntu-22.04, app, 3.10)"
-      - "install-pkg (ubuntu-22.04, fabric, 3.7)"
+      - "install-pkg (ubuntu-22.04, fabric, 3.8)"
       - "install-pkg (ubuntu-22.04, fabric, 3.10)"
-      - "install-pkg (ubuntu-22.04, pytorch, 3.7)"
+      - "install-pkg (ubuntu-22.04, pytorch, 3.8)"
       - "install-pkg (ubuntu-22.04, pytorch, 3.10)"
-      - "install-pkg (ubuntu-22.04, lightning, 3.7)"
+      - "install-pkg (ubuntu-22.04, lightning, 3.8)"
       - "install-pkg (ubuntu-22.04, lightning, 3.10)"
-      - "install-pkg (ubuntu-22.04, notset, 3.7)"
+      - "install-pkg (ubuntu-22.04, notset, 3.8)"
       - "install-pkg (ubuntu-22.04, notset, 3.10)"
-      - "install-pkg (macOS-12, app, 3.7)"
+      - "install-pkg (macOS-12, app, 3.8)"
       - "install-pkg (macOS-12, app, 3.10)"
-      - "install-pkg (macOS-12, fabric, 3.7)"
+      - "install-pkg (macOS-12, fabric, 3.8)"
       - "install-pkg (macOS-12, fabric, 3.10)"
-      - "install-pkg (macOS-12, pytorch, 3.7)"
+      - "install-pkg (macOS-12, pytorch, 3.8)"
       - "install-pkg (macOS-12, pytorch, 3.10)"
-      - "install-pkg (macOS-12, lightning, 3.7)"
+      - "install-pkg (macOS-12, lightning, 3.8)"
       - "install-pkg (macOS-12, lightning, 3.10)"
-      - "install-pkg (macOS-12, notset, 3.7)"
+      - "install-pkg (macOS-12, notset, 3.8)"
       - "install-pkg (macOS-12, notset, 3.10)"
-      - "install-pkg (windows-2022, app, 3.7)"
+      - "install-pkg (windows-2022, app, 3.8)"
       - "install-pkg (windows-2022, app, 3.10)"
-      - "install-pkg (windows-2022, fabric, 3.7)"
+      - "install-pkg (windows-2022, fabric, 3.8)"
       - "install-pkg (windows-2022, fabric, 3.10)"
-      - "install-pkg (windows-2022, pytorch, 3.7)"
+      - "install-pkg (windows-2022, pytorch, 3.8)"
       - "install-pkg (windows-2022, pytorch, 3.10)"
-      - "install-pkg (windows-2022, lightning, 3.7)"
+      - "install-pkg (windows-2022, lightning, 3.8)"
       - "install-pkg (windows-2022, lightning, 3.10)"
-      - "install-pkg (windows-2022, notset, 3.7)"
+      - "install-pkg (windows-2022, notset, 3.8)"
       - "install-pkg (windows-2022, notset, 3.10)"
 
   - id: "link-check"
diff --git a/.github/workflows/ci-dockers-pytorch.yml b/.github/workflows/ci-dockers-pytorch.yml
@@ -65,7 +65,7 @@ jobs:
       fail-fast: false
       matrix:
         # the config used in '.github/workflows/tpu-tests.yml'
-        python_version: ["3.7"]
+        python_version: ["3.8"]
         xla_version: ["1.12"]
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/ci-pkg-install.yml b/.github/workflows/ci-pkg-install.yml
@@ -44,7 +44,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macOS-12, windows-2022]
         pkg-name: ["app", "fabric", "pytorch", "lightning", "notset"]
-        python-version: ["3.7" , "3.10"]
+        python-version: ["3.8" , "3.10"]
         # TODO: add also install from source
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml
@@ -51,9 +51,9 @@ jobs:
           - {os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.10", pytorch-version: "1.13"}
           - {os: "windows-2022", pkg-name: "fabric", python-version: "3.10", pytorch-version: "1.13"}
           # "oldest" versions tests, only on minimum Python
-          - {os: "macOS-11", pkg-name: "fabric", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
-          - {os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
-          - {os: "windows-2022", pkg-name: "fabric", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
+          - {os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"}
+          - {os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"}
+          - {os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"}
           # "lightning" installs the monolithic package
           - {os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
           - {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
@@ -118,8 +118,6 @@ jobs:
           --source_import="lightning_fabric" --target_import="lightning.fabric"
 
     - name: Testing Warnings
-      # the stacklevel can only be set on >=3.7
-      if: matrix.python-version != '3.7'
       working-directory: tests/tests_fabric
       # needs to run outside of `pytest`
       run: python utilities/test_warnings.py
diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml
@@ -55,19 +55,19 @@ jobs:
           - {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13"}
           - {os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13"}
           # "oldest" versions tests, only on minimum Python
-          - {os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"}  # 3.7 hangs
-          - {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
-          - {os: "windows-2022", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
+          - {os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"}
+          - {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"}
+          - {os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"}
           # run test under SLOW label
-          - {type: "slow", os: "macOS-11", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.11"}
-          - {type: "slow", os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.11"}
-          - {type: "slow", os: "windows-2022", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.11"}
+          - {type: "slow", os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.11"}
+          - {type: "slow", os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.11"}
+          - {type: "slow", os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.11"}
           # "lightning" installs the monolithic package
           - {os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
           - {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
 
-    timeout-minutes: 70  # tests with macOS-11, py3.7 oldest takes much longer then expected
+    timeout-minutes: 70
 
     steps:
     - uses: actions/checkout@v3
@@ -151,8 +151,6 @@ jobs:
           --target_import="lightning.pytorch,lightning.fabric"
 
     - name: Testing Warnings
-      # the stacklevel can only be set on >=3.7
-      if: matrix.python-version != '3.7'
       working-directory: tests/tests_pytorch
       # needs to run outside of `pytest`
       run: python utilities/test_warnings.py
diff --git a/.github/workflows/tpu-tests.yml b/.github/workflows/tpu-tests.yml
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: github.event.pull_request.draft == false
     env:
-      PYTHON_VER: 3.7
+      PYTHON_VER: 3.8
     strategy:
       fail-fast: false
       max-parallel: 1  # run sequential
diff --git a/README.md b/README.md
@@ -93,16 +93,13 @@ Lightning is rigorously tested across multiple CPUs, GPUs, TPUs, IPUs, and HPUs
 
 |   System / PyTorch ver.    |                                                                                                               1.10                                                                                                                |                                                                                                       1.12                                                                                                       |
 | :------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-|  Linux py3.7 \[GPUs\*\*\]  |                                                                                                                 -                                                                                                                 |                                                                                                        -                                                                                                         |
-| Linux py3.7 \[TPUs\*\*\*\] |                                                                                                                 -                                                                                                                 |                                                                                                        -                                                                                                         |
+|  Linux py3.9 \[GPUs\*\*\]  |                                                                                                                 -                                                                                                                 |                                                                                                        -                                                                                                         |
+| Linux py3.9 \[TPUs\*\*\*\] |                                                                                                                 -                                                                                                                 |                                                                                                        -                                                                                                         |
 |    Linux py3.8 \[IPUs\]    |                                                                                                                 -                                                                                                                 |                                                                                                        -                                                                                                         |
 |    Linux py3.8 \[HPUs\]    | [![Build Status](https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20%28HPUs%29?branchName=master)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=26&branchName=master) |                                                                                                        -                                                                                                         |
-|      Linux py3.{7,9}       |                                                                                                                 -                                                                                                                 | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
-|       OSX py3.{7,9}        |                                                                                                                 -                                                                                                                 | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
-|     Windows py3.{7,9}      |                                                                                                                 -                                                                                                                 | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
-
-- _\*\* tests run on two NVIDIA P100_
-- _\*\*\* tests run on Google GKE TPUv2/3. TPU py3.7 means we support Colab and Kaggle env._
+|     Linux py3.{8,9,10}     |                                                                                                                 -                                                                                                                 | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
+|      OSX py3.{8,9,10}      |                                                                                                                 -                                                                                                                 | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
+|    Windows py3.{8,9,10}    |                                                                                                                 -                                                                                                                 | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
 
 </center>
 </details>
diff --git a/docs/source-pytorch/advanced/post_training_quantization.rst b/docs/source-pytorch/advanced/post_training_quantization.rst
@@ -33,7 +33,7 @@ Installation
 Prerequisites
 =============
 
-Python version: 3.7, 3.8, 3.9, 3.10
+Python version: 3.8, 3.9, 3.10
 
 Install Intel® Neural Compressor
 ================================
diff --git a/environment.yml b/environment.yml
@@ -26,7 +26,7 @@ channels:
     - conda-forge
 
 dependencies:
-    - python>=3.7
+    - python>=3.8
     - pip>20.1
     - numpy>=1.17.2
     - pytorch>=1.10.*
diff --git a/requirements/fabric/strategies.txt b/requirements/fabric/strategies.txt
@@ -1,3 +1,3 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
-deepspeed>=0.6.0, <=0.7.0; python_version>"3.7" and platform_system != "Windows"
+deepspeed>=0.6.0, <=0.7.0; platform_system != "Windows"
diff --git a/src/lightning/__setup__.py b/src/lightning/__setup__.py
@@ -76,7 +76,7 @@ def _setup_args() -> Dict[str, Any]:
         include_package_data=True,
         zip_safe=False,
         keywords=["deep learning", "pytorch", "AI"],  # todo: aggregate tags from all packages
-        python_requires=">=3.7",  # todo: take the lowes based on all packages
+        python_requires=">=3.8",  # todo: take the lowes based on all packages
         entry_points={
             "console_scripts": [
                 "lightning = lightning.app.cli.lightning_cli:main",
@@ -107,7 +107,6 @@ def _setup_args() -> Dict[str, Any]:
             "Operating System :: OS Independent",
             # Specify the Python versions you support here.
             "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/src/lightning_app/__setup__.py b/src/lightning_app/__setup__.py
@@ -74,7 +74,7 @@ def _setup_args() -> Dict[str, Any]:
         include_package_data=True,
         zip_safe=False,
         keywords=["deep learning", "pytorch", "AI"],
-        python_requires=">=3.7",
+        python_requires=">=3.8",
         entry_points={
             "console_scripts": [
                 "lightning = lightning_app.cli.lightning_cli:main",
@@ -106,7 +106,6 @@ def _setup_args() -> Dict[str, Any]:
             # Specify the Python versions you support here. In particular, ensure
             # that you indicate whether you support Python 2, Python 3 or both.
             "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/src/lightning_app/cli/component-template/.github/workflows/ci-testing.yml b/src/lightning_app/cli/component-template/.github/workflows/ci-testing.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macOS-11, windows-2019]
-        python-version: [3.7]
+        python-version: [3.8]
 
     # Timeout: https://stackoverflow.com/a/59076067/4521646
     timeout-minutes: 35
diff --git a/src/lightning_app/components/database/utilities.py b/src/lightning_app/components/database/utilities.py
@@ -125,7 +125,7 @@ def compare_values(self, x, y):
     return PydanticJSONType
 
 
-@functools.lru_cache(maxsize=128)  # compatibility for py3.7
+@functools.lru_cache(maxsize=128)
 def _get_primary_key(model_type: Type["SQLModel"]) -> str:
     primary_keys = sqlalchemy_inspect(model_type).primary_key
 
diff --git a/src/lightning_app/utilities/packaging/build_config.py b/src/lightning_app/utilities/packaging/build_config.py
diff --git a/src/lightning_fabric/__setup__.py b/src/lightning_fabric/__setup__.py
diff --git a/src/pytorch_lightning/README.md b/src/pytorch_lightning/README.md
diff --git a/src/pytorch_lightning/__setup__.py b/src/pytorch_lightning/__setup__.py
diff --git a/tests/tests_app/utilities/packaging/projects/Dockerfile.cpu b/tests/tests_app/utilities/packaging/projects/Dockerfile.cpu
diff --git a/tests/tests_app/utilities/packaging/projects/dockerfile/comp_dockerfile/a/Dockerfile b/tests/tests_app/utilities/packaging/projects/dockerfile/comp_dockerfile/a/Dockerfile
diff --git a/tests/tests_pytorch/loggers/test_logger.py b/tests/tests_pytorch/loggers/test_logger.py
