Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop sphinx 4 support #90

Merged
merged 5 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/rstcheck_core/_extras.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down
17 changes: 8 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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}


Expand Down Expand Up @@ -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}
Expand All @@ -161,7 +161,6 @@ extras =
testing
yaml
deps =
sphinx4: sphinx>=4,<5
sphinx5: sphinx>=5,<6
sphinx6: sphinx>=6,<7
sphinx7: sphinx>=7,<8
Expand Down
Loading