Merge branch 'main' into pre-commit-ci-update-config

CHANGELOG.md

@@ -22,14 +22,15 @@ NOTE: please use them in this order.
 ### Miscellaneous
 
 - Fixed yaml tests running even when pyyaml is not installed ([#84](https://github.com/rstcheck/rstcheck-core/issues/84))
+- Drop support for sphinx v4 ([#90](https://github.com/rstcheck/rstcheck-core/pull/90))
 
 ## [1.2.0 (2023-11-13)](https://github.com/rstcheck/rstcheck-core/releases/v1.2.0)
 
 [diff v1.1.1...v1.2.0](https://github.com/rstcheck/rstcheck-core/compare/v1.1.1...v1.2.0)
 
 ### Miscellaneous
 
-- Remove unused pre python 3.8 compatibility code ([#74](https://github.com/rstcheck/rstcheck/pull/74))
+- Remove unused pre python 3.8 compatibility code ([#74](https://github.com/rstcheck-core/rstcheck/pull/74))
 - Add optional YAML code block support ([#77](https://github.com/rstcheck/rstcheck-core/issues/77))
 - Improve log message content and reduce log level to warning for missing line numbers in
   literal blocks ([#81](https://github.com/rstcheck/rstcheck-core/issues/81))

pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-sphinx = ["sphinx >=4.0"]
+sphinx = ["sphinx >=5.0"]
 toml = ["tomli >=2.0; python_version<='3.10'"]
 yaml = ["pyyaml >= 6.0.0"]
 testing = [
@@ -41,7 +41,7 @@ testing = [
     "pytest-mock >=3.7",
 ]
 docs = [
-    "sphinx >=4.0, !=7.2.5",
+    "sphinx >=5.0, !=7.2.5",
     "m2r2 >=0.3.2",
     "sphinx-rtd-theme >=1.2",
     "sphinx-autodoc-typehints >=1.15",

src/rstcheck_core/_extras.py

@@ -40,7 +40,7 @@ class DependencyInfos(t.TypedDict):
 
 
 ExtraDependenciesInfos: dict[ExtraDependencies, DependencyInfos] = {
-    "sphinx": DependencyInfos(min_version=(2, 0), extra="sphinx"),
+    "sphinx": DependencyInfos(min_version=(5, 0), extra="sphinx"),
     "tomli": DependencyInfos(min_version=(2, 0), extra="toml"),
 }
 """Dependency map with their min. supported version and extra by which they can be installed."""

tox.ini

@@ -10,18 +10,18 @@ env_list =
     package
     pre-commit-run
     py{312,311,310,39,38}
-    py{312,311,310,39,38}-with-sphinx{4,5,6,7}
+    py{312,311,310,39,38}-with-sphinx{5,6,7}
     py{312,311,310,39,38}-with-tomli
     coverage-all
     docs-test-{html,linkcheck,coverage,doctest,spelling}
 
 labels =
-    test = py{312,311,310,39,38},py{312,311,310,39,38}-with-yaml,py{312,311,310,39,38}-with-sphinx{4,5,6,7},py{312,311,310,39,38}-with-tomli,coverage-all
-    py3.8 = py38,py38-with-yaml,py38-with-sphinx{4,5,6,7},py38-with-tomli,coverage-all
-    py3.9 = py39,py39-with-yaml,py39-with-sphinx{4,5,6,7},py39-with-tomli,coverage-all
-    py3.10 = py310,py310-with-yaml,py310-with-sphinx{4,5,6,7},py310-with-tomli,package,coverage-all
-    py3.11 = py311,py311-with-yaml,py311-with-sphinx{4,5,6,7},py311-with-tomli,package,coverage-all
-    py3.12 = py312,py312-with-yaml,py312-with-sphinx{4,5,6,7},py312-with-tomli,package,coverage-all
+    test = py{312,311,310,39,38},py{312,311,310,39,38}-with-yaml,py{312,311,310,39,38}-with-sphinx{5,6,7},py{312,311,310,39,38}-with-tomli,coverage-all
+    py3.8 = py38,py38-with-yaml,py38-with-sphinx{5,6,7},py38-with-tomli,coverage-all
+    py3.9 = py39,py39-with-yaml,py39-with-sphinx{5,6,7},py39-with-tomli,coverage-all
+    py3.10 = py310,py310-with-yaml,py310-with-sphinx{5,6,7},py310-with-tomli,package,coverage-all
+    py3.11 = py311,py311-with-yaml,py311-with-sphinx{5,6,7},py311-with-tomli,package,coverage-all
+    py3.12 = py312,py312-with-yaml,py312-with-sphinx{5,6,7},py312-with-tomli,package,coverage-all
     docs = docs-test-{html,linkcheck,coverage,doctest,spelling}
 
 
@@ -149,7 +149,7 @@ commands =
         {posargs:tests}
 
 
-[testenv:py{312,311,310,39,38}-with-sphinx{4,5,6,7}]
+[testenv:py{312,311,310,39,38}-with-sphinx{5,6,7}]
 description = run tests with {basepython} and sphinx
 pass_env =
     {[testenv]pass_env}
@@ -161,7 +161,6 @@ extras =
     testing
     yaml
 deps =
-    sphinx4: sphinx>=4,<5
     sphinx5: sphinx>=5,<6
     sphinx6: sphinx>=6,<7
     sphinx7: sphinx>=7,<8