diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 794d170..8cd7db1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,7 +44,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install .[test] + python -m pip install .[test,standalone] - name: Test with pytest run: python -m pytest -vv --durations 25 diff --git a/CHANGES b/CHANGES index d5e31c7..6f37462 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Release 1.0.6 (unreleased) +========================== + +* Remove Sphinx as a required dependency, as circular dependencies may cause + failure with package managers that expect a directed acyclic graph (DAG) + of dependencies. + Release 1.0.5 (2023-08-09) ========================== diff --git a/pyproject.toml b/pyproject.toml index 72dd83c..a68d669 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,9 +39,7 @@ classifiers = [ "Topic :: Text Processing", "Topic :: Utilities", ] -dependencies = [ - "Sphinx>=5", -] +dependencies = [] dynamic = ["version"] [project.optional-dependencies] @@ -53,6 +51,9 @@ lint = [ "mypy", "docutils-stubs", ] +standalone = [ + "Sphinx>=5", +] [[project.authors]] name = "Georg Brandl" diff --git a/sphinxcontrib/qthelp/__init__.py b/sphinxcontrib/qthelp/__init__.py index 3d3f363..e840c6d 100644 --- a/sphinxcontrib/qthelp/__init__.py +++ b/sphinxcontrib/qthelp/__init__.py @@ -253,6 +253,7 @@ def get_project_files(self, outdir: str | os.PathLike[str]) -> list[str]: def setup(app: Sphinx) -> dict[str, Any]: + app.require_sphinx('5.0') app.setup_extension('sphinx.builders.html') app.add_builder(QtHelpBuilder) app.add_message_catalog(__name__, path.join(package_dir, 'locales'))