From 3b25c2c4abdcd23de617b0bf7c0cd2e465659161 Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Sat, 25 May 2024 12:24:03 +0200
Subject: [PATCH] Remove support for Python 3.7 as reached EOL (#713)

---
 .github/workflows/create.yml   | 15 +++------------
 .github/workflows/push-x86.yml |  1 -
 .github/workflows/push.yml     |  9 ---------
 setup_sdist.py                 |  1 -
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/create.yml b/.github/workflows/create.yml
index d78194ef..f6680b34 100644
--- a/.github/workflows/create.yml
+++ b/.github/workflows/create.yml
@@ -109,7 +109,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'kivy-ubuntu-arm64']
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.7', 'pypy3.8', 'pypy3.9']
+        python: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.8', 'pypy3.9']
         include:
           # We may would like to introduce tests also on windows-latest on x86 (win32 wheels)?
           - os: ubuntu-latest
@@ -193,17 +193,8 @@ jobs:
           cd tests
           CLASSPATH=../build/test-classes:../build/classes python -m pytest -v
 
-      - name: Test wheel ( Windows + Python == 3.7.x )
-        # On Python < 3.8.x, we can't use `os.add_dll_directory`, so the jre should be in PATH.
-        if: (matrix.os == 'windows-latest') && contains(matrix.python, '3.7')
-        run: |
-          cd tests
-          $env:PATH +=";$env:JAVA_HOME\jre\bin\server\;$env:JAVA_HOME\jre\bin\client\;$env:JAVA_HOME\bin\server\"
-          $env:CLASSPATH ="../build/test-classes;../build/classes"
-          python -m pytest -v
-
-      - name: Test wheel (Windows + Python != 3.7.x )
-        if: (matrix.os == 'windows-latest') && !contains(matrix.python, '3.7')
+      - name: Test wheel (Windows)
+        if: matrix.os == 'windows-latest'
         run: |
           cd tests
           $env:CLASSPATH ="../build/test-classes;../build/classes"
diff --git a/.github/workflows/push-x86.yml b/.github/workflows/push-x86.yml
index 38341734..f247a760 100644
--- a/.github/workflows/push-x86.yml
+++ b/.github/workflows/push-x86.yml
@@ -7,7 +7,6 @@ jobs:
     strategy:
       matrix:
         python:
-           - '3.7'
            - '3.8'
            - '3.9'
            - '3.10'
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 75920fd9..c3b5c95e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -7,13 +7,11 @@ jobs:
     strategy:
       matrix:
         python:
-           - '3.7'
            - '3.8'
            - '3.9'
            - '3.10'
            - '3.11'
            - '3.12'
-           - 'pypy-3.7'
            - 'pypy-3.8'
            - 'pypy-3.9'
         java:
@@ -47,21 +45,14 @@ jobs:
             architecture: x86
           - os: apple-silicon-m1
             architecture: x64
-          - os: apple-silicon-m1
-            python: '3.7'
           - os: apple-silicon-m1
             python: '3.8'
           - os: apple-silicon-m1
             python: '3.9'
-          - os: apple-silicon-m1
-            python: 'pypy-3.7'
           - os: apple-silicon-m1
             python: 'pypy-3.8'
           - os: apple-silicon-m1
             python: 'pypy-3.9'
-          - os: windows-latest
-            architecture: x86
-            python: 'pypy-3.7'
           - os: windows-latest
             architecture: x86
             python: 'pypy-3.8'
diff --git a/setup_sdist.py b/setup_sdist.py
index ab3d992e..219974eb 100644
--- a/setup_sdist.py
+++ b/setup_sdist.py
@@ -56,7 +56,6 @@
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: Linux',
         'Operating System :: Android',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',