From c7180358a4176408503777ecedcf7763f305c5f9 Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 14 Jul 2025 08:23:59 +0200
Subject: [PATCH 1/5] Update Travis CI

---
 .travis.yml | 75 +++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e6ca540..06f845f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,51 +1,48 @@
-dist: trusty
-sudo: false
+dist: focal
 language: python
+
 notifications:
   email: false
-matrix:
-  include:
-  - python: 3.5
-  - python: 3.6
-  - python: 3.7
-    dist: xenial
-    sudo: required
-  - python: 3.8
-    dist: xenial
-    sudo: required
-  - python: 3.9
-    dist: xenial
-    sudo: required
-  - python: 3.11
-    dist: xenial
-    sudo: required
+
+python:
+  - "3.9"
+  - "3.10"
+  - "3.11"
+  - "3.12"
+  - "3.13"
+
 env:
   global:
-  - CFLAGS=-coverage
-  - LDFLAGS=-coverage -lgcov
-  - PYXMLSEC_TEST_ITERATIONS=50
+    - CFLAGS=-coverage
+    - LDFLAGS=-coverage -lgcov
+    - PYXMLSEC_TEST_ITERATIONS=50
 
 addons:
   apt:
     packages:
-    - libssl-dev
-    - libxmlsec1
-    - libxmlsec1-dev
-    - libxmlsec1-openssl
-    - libxslt1-dev
-    - pkg-config
-    - lcov
+      - libssl-dev
+      - libxmlsec1
+      - libxmlsec1-dev
+      - libxmlsec1-openssl
+      - libxslt1-dev
+      - pkg-config
+      - lcov
+
 install:
-- travis_retry pip install --upgrade pip setuptools wheel
-- travis_retry pip install coverage -r requirements-test.txt --upgrade --force-reinstall
-- python setup.py bdist_wheel
-- pip install xmlsec --only-binary=xmlsec --no-index --find-links=dist/
-script: coverage run -m pytest -v tests --color=yes
+  - travis_retry pip install --upgrade pip setuptools wheel
+  - travis_retry pip install coverage -r requirements-test.txt --upgrade --force-reinstall
+  - python setup.py bdist_wheel
+  - pip install xmlsec --only-binary=xmlsec --no-index --find-links=dist/
+
+script:
+  - coverage run -m pytest -v tests --color=yes
+
 after_success:
-- lcov --capture --no-external --directory . --output-file coverage.info
-- lcov --list coverage.info
-- bash <(curl -s https://codecov.io/bash) -f coverage.info
+  - lcov --capture --no-external --directory . --output-file coverage.info
+  - lcov --list coverage.info
+  - bash <(curl -s https://codecov.io/bash) -f coverage.info
+
 before_deploy:
-- travis_retry pip install Sphinx -r doc/source/requirements.txt
-- git apply --verbose --no-index --unsafe-paths --directory=$(python -c "import site; print(site.getsitepackages()[0])") doc/source/sphinx-pr-6916.diff
-- sphinx-build -EWanb html doc/source build/sphinx
+  - travis_retry pip install Sphinx -r doc/source/requirements.txt
+  - git apply --verbose --no-index --unsafe-paths --directory=$(python -c "import site; print(site.getsitepackages()[0])") doc/source/sphinx-pr-6916.diff
+  - sphinx-build -EWanb html doc/source build/sphinx

From 58ad24ceb6d261ff4d5b55660de4e497d9a31b09 Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 14 Jul 2025 08:30:51 +0200
Subject: [PATCH 2/5] Stop supporting python 3.8

---
 .github/workflows/macosx.yml    | 2 +-
 .github/workflows/manylinux.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index f639637e..9bb758f4 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -1,4 +1,4 @@
-name: MacOS
+name: macOS
 on: [push, pull_request]
 jobs:
   macosx:
diff --git a/.github/workflows/manylinux.yml b/.github/workflows/manylinux.yml
index db8ea913..818303b7 100644
--- a/.github/workflows/manylinux.yml
+++ b/.github/workflows/manylinux.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-abi: [cp38-cp38, cp39-cp39, cp310-cp310, cp311-cp311, cp312-cp312, cp313-cp313]
+        python-abi: [cp39-cp39, cp310-cp310, cp311-cp311, cp312-cp312, cp313-cp313]
         image:
           - manylinux2014_x86_64
           - manylinux_2_28_x86_64

From fa3d28e0483d081cc01a29f4785c11b45f7e6e1b Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 14 Jul 2025 08:39:42 +0200
Subject: [PATCH 3/5] Stop creating wheels for 32bit linux and windows
 platforms

Base on pypi statistics, those archs barely being downloaded.
---
 pyproject.toml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 540f91c1..2b8362bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,14 +51,6 @@ build-verbosity = 1
 build-frontend = "build"
 skip = [
     "pp*",
-    "*-musllinux_i686",
-    # LXML doesn't publish wheels for these platforms, which makes it
-    # difficult for us to build wheels, so we exclude them.
-    "cp36-*",
-    "cp37-*",
-    "cp38-manylinux_aarch64",
-    "cp38-musllinux_aarch64",
-    "cp38-macosx*",
 ]
 test-command = "pytest -v --color=yes {package}/tests"
 before-test = "pip install -r requirements-test.txt"
@@ -68,7 +60,7 @@ test-skip = "*-macosx_arm64"
 PYXMLSEC_STATIC_DEPS = "true"
 
 [tool.cibuildwheel.linux]
-archs = ["x86_64", "aarch64", "i686"]
+archs = ["x86_64", "aarch64"]
 environment-pass = [
     "PYXMLSEC_LIBXML2_VERSION",
     "PYXMLSEC_LIBXSLT_VERSION",
@@ -81,7 +73,7 @@ archs = ["x86_64", "arm64"]
 before-all = "brew install perl"
 
 [tool.cibuildwheel.windows]
-archs = ["AMD64", "x86"]
+archs = ["AMD64"]
 
 [[tool.cibuildwheel.overrides]]
 select = "*-manylinux*"

From bb6db861b77f7f5193181ffa68f9eb60fedf9954 Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 14 Jul 2025 08:50:56 +0200
Subject: [PATCH 4/5] Cancel on concurrency

Cancel the old build when there're new changes in the branch/PR.
---
 .github/workflows/linuxbrew.yml | 3 +++
 .github/workflows/macosx.yml    | 3 +++
 .github/workflows/manylinux.yml | 3 +++
 .github/workflows/sdist.yml     | 3 +++
 .github/workflows/wheels.yml    | 4 ++++
 .travis.yml                     | 4 ++++
 6 files changed, 20 insertions(+)

diff --git a/.github/workflows/linuxbrew.yml b/.github/workflows/linuxbrew.yml
index c3ede39b..404321ea 100644
--- a/.github/workflows/linuxbrew.yml
+++ b/.github/workflows/linuxbrew.yml
@@ -1,5 +1,8 @@
 name: linuxbrew
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   linuxbrew:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 9bb758f4..7961b5b9 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -1,5 +1,8 @@
 name: macOS
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   macosx:
     runs-on: macos-latest
diff --git a/.github/workflows/manylinux.yml b/.github/workflows/manylinux.yml
index 818303b7..9d578f05 100644
--- a/.github/workflows/manylinux.yml
+++ b/.github/workflows/manylinux.yml
@@ -1,5 +1,8 @@
 name: manylinux
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   manylinux:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml
index 04f22c14..3f3eacf0 100644
--- a/.github/workflows/sdist.yml
+++ b/.github/workflows/sdist.yml
@@ -1,5 +1,8 @@
 name: sdist
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   sdist:
     # Avoid Ubuntu 24.04 in sdist workflows, because it contains libxmlsec1-dev
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ae10888c..6b74c1b6 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -15,6 +15,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.travis.yml b/.travis.yml
index 06f845f8..9574a1c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 dist: focal
 language: python
+travis:
+  auto_cancel:
+    push: true
+    pull_request: true
 
 notifications:
   email: false

From ccc55efd7930a9d6810ee3b76e4bedeb3aaab45c Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 14 Jul 2025 09:32:40 +0200
Subject: [PATCH 5/5] Specify exactly which python version to be used for
 building wheels

---
 pyproject.toml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2b8362bc..a0380dcf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -47,10 +47,17 @@ known_third_party = ['lxml', 'pytest', '_pytest', 'hypothesis']
 requires = ['setuptools>=42', 'wheel', 'setuptools_scm[toml]>=3.4', "pkgconfig>=1.5.1", "lxml>=3.8, !=4.7.0"]
 
 [tool.cibuildwheel]
+build = [
+    "cp39-*",
+    "cp310-*",
+    "cp311-*",
+    "cp312-*",
+    "cp313-*"
+]
 build-verbosity = 1
 build-frontend = "build"
 skip = [
-    "pp*",
+    "pp*",  # Skips PyPy builds (pp38-*, pp39-*, etc.)
 ]
 test-command = "pytest -v --color=yes {package}/tests"
 before-test = "pip install -r requirements-test.txt"