From 91912c82ae576288ad57bab0238c3b1c6066a8f2 Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Fri, 21 Jun 2024 19:40:18 +0200
Subject: [PATCH] Drop support for Python 3.6, update actions

---
 .github/workflows/python-package.yml | 25 ++++++++++++-------------
 pyproject.toml                       |  7 +------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 03f13a0b..1a001ac6 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,12 +13,11 @@ on:
 
 jobs:
   test_py3:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
@@ -26,45 +25,45 @@ jobs:
           - "3.11"
           - "3.12"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Install dependencies
       run: |
         pip install -U setuptools
         sudo apt-get update -qq
-        sudo apt-get install -qq swig python-dev libxml2-dev libxmlsec1-dev
+        sudo apt-get install -qq swig libxml2-dev libxmlsec1-dev
         make install-req
         make install-test
     - name: Test
       run: make pytest
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: CI
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.12"
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Install dependencies
       run: |
         pip install -U setuptools
         sudo apt-get update -qq
-        sudo apt-get install -qq swig python-dev libxml2-dev libxmlsec1-dev
+        sudo apt-get install -qq swig libxml2-dev libxmlsec1-dev
         pip install --force-reinstall --no-binary lxml lxml
         make install-req
         make install-test
diff --git a/pyproject.toml b/pyproject.toml
index 5d9130d4..df64252c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,11 +23,6 @@ keywords = [
     "identity",
 ]
 classifiers = [
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -41,7 +36,7 @@ dependencies = [
     "xmlsec>=1.3.9",
     "isodate>=0.6.1",
 ]
-requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+requires-python = ">=3.7"
 
 [project.urls]
 Homepage = "https://saml.info"