From 79228d4af2c6ff540132e90300477b239bc7367c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Pie=C5=84kowski?=
 <8525083+Jakski@users.noreply.github.com>
Date: Thu, 21 Nov 2024 21:46:00 +0100
Subject: [PATCH] t

---
 .github/workflows/tests.yml |  7 ++-----
 ci.sh                       | 10 ++--------
 pyproject.toml              |  4 ++--
 tests/requirements-1.txt    | 14 +++++++-------
 tests/requirements-2.txt    | 14 +++++++-------
 tests/requirements-3.txt    |  2 +-
 tests/requirements-4.txt    |  8 ++++----
 7 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 32a077b..f608967 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,11 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - {python: "3.9", env: "1"}
-          - {python: "3.9", env: "2"}
-          - {python: "3.9", env: "3"}
-          - {python: "3.9", env: "4"}
+        python: ["3.10", "3.11"]
+        env: ["1", "2", "3"]
     steps:
       - name: Cache dependencies
         uses: actions/cache@v2
diff --git a/ci.sh b/ci.sh
index da557e3..b795a08 100755
--- a/ci.sh
+++ b/ci.sh
@@ -27,13 +27,7 @@ update_requirements_cmd() {
 	declare i
 	declare -a env1 env2 env3 env4
 	# Some contrib extensions don't specify required Sphinx version in dependencies, yet fail on setup
-
-	# ImportError: cannot import name 'environmentfilter' from 'jinja2'
 	env1=(
-		"Sphinx>=3,<4"
-		"jinja2==3.0.3"
-	)
-	env2=(
 		"Sphinx>=4,<5"
 		"sphinxcontrib-applehelp<=1.0.5"
 		"sphinxcontrib-devhelp<=1.0.2"
@@ -41,8 +35,8 @@ update_requirements_cmd() {
 		"sphinxcontrib-serializinghtml<=1.1.5"
 		"sphinxcontrib-qthelp<=1.0.3"
 	)
-	env3=("Sphinx>=5,<6")
-	env4=("Sphinx>=5,<6" "ruamel.yaml>=0.17,<0.18")
+	env2=("Sphinx>=5,<6")
+	env3=("Sphinx>=5,<6" "ruamel.yaml>=0.17,<0.18")
 	for i in {1..4}; do
 		declare -n constraints="env${i}"
 		python3 -m venv --clear venv
diff --git a/pyproject.toml b/pyproject.toml
index 410ce83..7557bc3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,9 +18,9 @@ classifiers = [
   "License :: OSI Approved :: MIT License",
   "Topic :: Documentation",
 ]
-requires-python = ">=3.6"
+requires-python = ">=3.10"
 dependencies = [
-  "Sphinx>=3.5.1",
+  "Sphinx>=4",
   "ruamel.yaml>=0.16.12",
 ]
 
diff --git a/tests/requirements-1.txt b/tests/requirements-1.txt
index dc00275..b3191bc 100644
--- a/tests/requirements-1.txt
+++ b/tests/requirements-1.txt
@@ -2,7 +2,7 @@ alabaster==0.7.16
 babel==2.16.0
 certifi==2024.8.30
 charset-normalizer==3.4.0
-docutils==0.16
+docutils==0.17.1
 flake8==7.1.1
 idna==3.10
 imagesize==1.4.1
@@ -18,12 +18,12 @@ ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.12
 six==1.16.0
 snowballstemmer==2.2.0
-Sphinx==3.5.4
+Sphinx==4.5.0
 sphinx-testing==1.0.1
-sphinxcontrib-applehelp==2.0.0
-sphinxcontrib-devhelp==2.0.0
-sphinxcontrib-htmlhelp==2.1.0
+sphinxcontrib-applehelp==1.0.4
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.1
 sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==2.0.0
-sphinxcontrib-serializinghtml==2.0.0
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.5
 urllib3==2.2.3
diff --git a/tests/requirements-2.txt b/tests/requirements-2.txt
index b3191bc..76c9f4f 100644
--- a/tests/requirements-2.txt
+++ b/tests/requirements-2.txt
@@ -2,7 +2,7 @@ alabaster==0.7.16
 babel==2.16.0
 certifi==2024.8.30
 charset-normalizer==3.4.0
-docutils==0.17.1
+docutils==0.19
 flake8==7.1.1
 idna==3.10
 imagesize==1.4.1
@@ -18,12 +18,12 @@ ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.12
 six==1.16.0
 snowballstemmer==2.2.0
-Sphinx==4.5.0
+Sphinx==5.3.0
 sphinx-testing==1.0.1
-sphinxcontrib-applehelp==1.0.4
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.1
+sphinxcontrib-applehelp==2.0.0
+sphinxcontrib-devhelp==2.0.0
+sphinxcontrib-htmlhelp==2.1.0
 sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.5
+sphinxcontrib-qthelp==2.0.0
+sphinxcontrib-serializinghtml==2.0.0
 urllib3==2.2.3
diff --git a/tests/requirements-3.txt b/tests/requirements-3.txt
index 76c9f4f..3057209 100644
--- a/tests/requirements-3.txt
+++ b/tests/requirements-3.txt
@@ -14,7 +14,7 @@ pycodestyle==2.12.1
 pyflakes==3.2.0
 Pygments==2.18.0
 requests==2.32.3
-ruamel.yaml==0.18.6
+ruamel.yaml==0.17.40
 ruamel.yaml.clib==0.2.12
 six==1.16.0
 snowballstemmer==2.2.0
diff --git a/tests/requirements-4.txt b/tests/requirements-4.txt
index 3057209..410063a 100644
--- a/tests/requirements-4.txt
+++ b/tests/requirements-4.txt
@@ -1,8 +1,8 @@
-alabaster==0.7.16
+alabaster==1.0.0
 babel==2.16.0
 certifi==2024.8.30
 charset-normalizer==3.4.0
-docutils==0.19
+docutils==0.21.2
 flake8==7.1.1
 idna==3.10
 imagesize==1.4.1
@@ -14,11 +14,11 @@ pycodestyle==2.12.1
 pyflakes==3.2.0
 Pygments==2.18.0
 requests==2.32.3
-ruamel.yaml==0.17.40
+ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.12
 six==1.16.0
 snowballstemmer==2.2.0
-Sphinx==5.3.0
+Sphinx==8.1.3
 sphinx-testing==1.0.1
 sphinxcontrib-applehelp==2.0.0
 sphinxcontrib-devhelp==2.0.0