From 2a742db9bc5f7705a894c5a569123b31ab5efd5e Mon Sep 17 00:00:00 2001
From: Davide Brunato <brunato@sissa.it>
Date: Wed, 30 Oct 2024 17:57:39 +0100
Subject: [PATCH] Update CI tests

---
 .github/workflows/test-xmlschema.yml |  6 +++---
 tox.ini                              | 31 ++++++++++------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/test-xmlschema.yml b/.github/workflows/test-xmlschema.yml
index d0245f40..1ef51b89 100644
--- a/.github/workflows/test-xmlschema.yml
+++ b/.github/workflows/test-xmlschema.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, "3.13.0-rc.1", "pypy-3.10"]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, "3.13.0", "3.14.0-alpha.1", "pypy-3.10"]
         exclude:
           - os: macos-latest
             python-version: 3.8
@@ -36,7 +36,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install setuptools
       - name: Install optional dependencies
-        if: ${{ matrix.python-version != '3.13.0-rc.1' }}
+        if: ${{ matrix.python-version != '3.14.0-alpha.1' }}
         run: pip install lxml jinja2
       - name: Test with unittest
         run: |
@@ -48,5 +48,5 @@ jobs:
           flake8 xmlschema --max-line-length=100 --statistics
       - name: Lint with mypy
         run: |
-          pip install mypy==1.11.2 elementpath==4.4.0 lxml-stubs
+          pip install mypy==1.13.0 elementpath==4.5.0 lxml-stubs
           mypy --show-error-codes --strict xmlschema
diff --git a/tox.ini b/tox.ini
index 54bb5de1..24786c4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 min_version = 4.0
-envlist = flake8, py{38,39,310,311,312,313,py3}, ep{44,45}, docs,
-    mypy-py{38,39,310,311,312,py3}, coverage, pytest
+envlist = flake8, py{38,39,310,311,312,313,314,py3}, ep{44,45,46}, docs,
+    mypy-py{38,39,310,311,312,313,py3}, coverage, pytest
 skip_missing_interpreters = true
 work_dir = {tox_root}/../.tox/xmlschema
 
 [testenv]
 deps =
-    elementpath>=4.4.0, <5.0.0
+    elementpath>=4.5.0, <5.0.0
     lxml
     jinja2
     py312: memory_profiler
@@ -17,22 +17,13 @@ deps =
 commands =
     python -m unittest
 
-[testenv:py313]
-deps =
-    elementpath>=4.4.0, <5.0.0
-    jinja2
-
-[testenv:ep44]
-deps =
-    lxml
-    jinja2
-    elementpath~=4.4
-
-[testenv:ep45]
+[testenv:ep{44,45,46}]
 deps =
     lxml
     jinja2
-    elementpath~=4.5
+    ep44: elementpath~=4.4
+    ep45: elementpath~=4.5
+    ep46: elementpath~=4.6
 
 [testenv:docs]
 commands =
@@ -55,8 +46,8 @@ commands =
 
 [testenv:mypy-py{38,39,310,311,312,py3}]
 deps =
-    mypy==1.11.2
-    elementpath==4.4.0
+    mypy==1.13.0
+    elementpath==4.5.0
     lxml-stubs
     jinja2
 commands =
@@ -73,10 +64,10 @@ commands =
 deps =
     pytest
     pytest-randomly
-    elementpath>=4.4.0, <5.0.0
+    elementpath>=4.5.0, <5.0.0
     lxml
     jinja2
-    mypy==1.11.2
+    mypy==1.13.0
     lxml-stubs
 commands =
     pytest tests -ra