From 88edae1665ce825df9b8206eb5d76022c566e473 Mon Sep 17 00:00:00 2001 From: Felix Hekhorn Date: Wed, 17 Apr 2024 16:51:46 +0300 Subject: [PATCH] Drop recommonmark --- docs/source/conf.py | 8 +--- poetry.lock | 102 ++++++++++++++++++++++---------------------- pyproject.toml | 9 ++-- 3 files changed, 57 insertions(+), 62 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 9b23b6b19..c72565b8b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -14,15 +14,13 @@ import os import pathlib -from recommonmark.transform import AutoStructify - here = pathlib.Path(__file__).parent # -- Project information ----------------------------------------------------- project = "yadism" -copyright = "2019-2022, the N3PDF team" # pylint: disable=redefined-builtin -author = "N3PDF team" +copyright = "2019-2024, the NNPDF team" # pylint: disable=redefined-builtin +author = "NNPDF team" # -- General configuration --------------------------------------------------- @@ -46,7 +44,6 @@ # particularly in markdown. See # https://recommonmark.readthedocs.io/en/latest/#linking-to-headings-in-other-files "sphinx.ext.autosectionlabel", - "recommonmark", "sphinx.ext.napoleon", "sphinx.ext.graphviz", "sphinxcontrib.bibtex", @@ -352,5 +349,4 @@ def setup(app): }, True, ) - app.add_transform(AutoStructify) app.connect("builder-inited", run_apidoc) diff --git a/poetry.lock b/poetry.lock index 456c222e4..9df254a5e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -646,13 +646,13 @@ profile = ["gprof2dot (>=2022.7.29)"] [[package]] name = "docutils" -version = "0.16" +version = "0.18.1" description = "Docutils -- Python Documentation Utilities" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ - {file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"}, - {file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"}, + {file = "docutils-0.18.1-py2.py3-none-any.whl", hash = "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c"}, + {file = "docutils-0.18.1.tar.gz", hash = "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"}, ] [[package]] @@ -2599,22 +2599,6 @@ files = [ [package.dependencies] cffi = {version = "*", markers = "implementation_name == \"pypy\""} -[[package]] -name = "recommonmark" -version = "0.7.1" -description = "A docutils-compatibility bridge to CommonMark, enabling you to write CommonMark inside of Docutils & Sphinx projects." -optional = false -python-versions = "*" -files = [ - {file = "recommonmark-0.7.1-py2.py3-none-any.whl", hash = "sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f"}, - {file = "recommonmark-0.7.1.tar.gz", hash = "sha256:bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67"}, -] - -[package.dependencies] -commonmark = ">=0.8.1" -docutils = ">=0.11" -sphinx = ">=1.3.1" - [[package]] name = "referencing" version = "0.34.0" @@ -2865,56 +2849,58 @@ files = [ [[package]] name = "sphinx" -version = "4.5.0" +version = "7.3.5" description = "Python documentation generator" optional = false -python-versions = ">=3.6" +python-versions = ">=3.9" files = [ - {file = "Sphinx-4.5.0-py3-none-any.whl", hash = "sha256:ebf612653238bcc8f4359627a9b7ce44ede6fdd75d9d30f68255c7383d3a6226"}, - {file = "Sphinx-4.5.0.tar.gz", hash = "sha256:7bf8ca9637a4ee15af412d1a1d9689fec70523a68ca9bb9127c2f3eeb344e2e6"}, + {file = "sphinx-7.3.5-py3-none-any.whl", hash = "sha256:e6a8f418321429669ef9c1e20c1f294b3fe1f248206b46044c86e1545480687f"}, + {file = "sphinx-7.3.5.tar.gz", hash = "sha256:30d03bbaa53b77d38863fd6b95cc4edb4a84a1512787b3b0c12fb3b4fb25d9e9"}, ] [package.dependencies] -alabaster = ">=0.7,<0.8" -babel = ">=1.3" -colorama = {version = ">=0.3.5", markers = "sys_platform == \"win32\""} -docutils = ">=0.14,<0.18" -imagesize = "*" -importlib-metadata = {version = ">=4.4", markers = "python_version < \"3.10\""} -Jinja2 = ">=2.3" -packaging = "*" -Pygments = ">=2.0" -requests = ">=2.5.0" -snowballstemmer = ">=1.1" +alabaster = ">=0.7.14,<0.8.0" +babel = ">=2.9" +colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} +docutils = ">=0.18.1,<0.22" +imagesize = ">=1.3" +importlib-metadata = {version = ">=4.8", markers = "python_version < \"3.10\""} +Jinja2 = ">=3.0" +packaging = ">=21.0" +Pygments = ">=2.14" +requests = ">=2.25.0" +snowballstemmer = ">=2.0" sphinxcontrib-applehelp = "*" sphinxcontrib-devhelp = "*" sphinxcontrib-htmlhelp = ">=2.0.0" sphinxcontrib-jsmath = "*" sphinxcontrib-qthelp = "*" -sphinxcontrib-serializinghtml = ">=1.1.5" +sphinxcontrib-serializinghtml = ">=1.1.9" +tomli = {version = ">=2", markers = "python_version < \"3.11\""} [package.extras] docs = ["sphinxcontrib-websupport"] -lint = ["docutils-stubs", "flake8 (>=3.5.0)", "isort", "mypy (>=0.931)", "types-requests", "types-typed-ast"] -test = ["cython", "html5lib", "pytest", "pytest-cov", "typed-ast"] +lint = ["flake8 (>=3.5.0)", "importlib_metadata", "mypy (==1.9.0)", "pytest (>=6.0)", "ruff (==0.3.7)", "sphinx-lint", "tomli", "types-docutils", "types-requests"] +test = ["cython (>=3.0)", "defusedxml (>=0.7.1)", "pytest (>=6.0)", "setuptools (>=67.0)"] [[package]] name = "sphinx-rtd-theme" -version = "0.5.2" +version = "1.3.0" description = "Read the Docs theme for Sphinx" optional = false -python-versions = "*" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ - {file = "sphinx_rtd_theme-0.5.2-py2.py3-none-any.whl", hash = "sha256:4a05bdbe8b1446d77a01e20a23ebc6777c74f43237035e76be89699308987d6f"}, - {file = "sphinx_rtd_theme-0.5.2.tar.gz", hash = "sha256:32bd3b5d13dc8186d7a42fc816a23d32e83a4827d7d9882948e7b837c232da5a"}, + {file = "sphinx_rtd_theme-1.3.0-py2.py3-none-any.whl", hash = "sha256:46ddef89cc2416a81ecfbeaceab1881948c014b1b6e4450b815311a89fb977b0"}, + {file = "sphinx_rtd_theme-1.3.0.tar.gz", hash = "sha256:590b030c7abb9cf038ec053b95e5380b5c70d61591eb0b552063fbe7c41f0931"}, ] [package.dependencies] -docutils = "<0.17" -sphinx = "*" +docutils = "<0.19" +sphinx = ">=1.6,<8" +sphinxcontrib-jquery = ">=4,<5" [package.extras] -dev = ["bump2version", "sphinxcontrib-httpdomain", "transifex-client"] +dev = ["bump2version", "sphinxcontrib-httpdomain", "transifex-client", "wheel"] [[package]] name = "sphinxcontrib-applehelp" @@ -2934,21 +2920,21 @@ test = ["pytest"] [[package]] name = "sphinxcontrib-bibtex" -version = "2.6.2" +version = "2.5.0" description = "Sphinx extension for BibTeX style citations." optional = false -python-versions = ">=3.7" +python-versions = ">=3.6" files = [ - {file = "sphinxcontrib-bibtex-2.6.2.tar.gz", hash = "sha256:f487af694336f28bfb7d6a17070953a7d264bec43000a2379724274f5f8d70ae"}, - {file = "sphinxcontrib_bibtex-2.6.2-py3-none-any.whl", hash = "sha256:10d45ebbb19207c5665396c9446f8012a79b8a538cb729f895b5910ab2d0b2da"}, + {file = "sphinxcontrib-bibtex-2.5.0.tar.gz", hash = "sha256:71b42e5db0e2e284f243875326bf9936aa9a763282277d75048826fef5b00eaa"}, + {file = "sphinxcontrib_bibtex-2.5.0-py3-none-any.whl", hash = "sha256:748f726eaca6efff7731012103417ef130ecdcc09501b4d0c54283bf5f059f76"}, ] [package.dependencies] -docutils = ">=0.8,<0.18.dev0 || >=0.20.dev0" +docutils = ">=0.8" importlib-metadata = {version = ">=3.6", markers = "python_version < \"3.10\""} pybtex = ">=0.24" pybtex-docutils = ">=1.0.0" -Sphinx = ">=3.5" +Sphinx = ">=2.1" [[package]] name = "sphinxcontrib-details-directive" @@ -2999,6 +2985,20 @@ lint = ["docutils-stubs", "flake8", "mypy"] standalone = ["Sphinx (>=5)"] test = ["html5lib", "pytest"] +[[package]] +name = "sphinxcontrib-jquery" +version = "4.1" +description = "Extension to include jQuery on newer Sphinx releases" +optional = false +python-versions = ">=2.7" +files = [ + {file = "sphinxcontrib-jquery-4.1.tar.gz", hash = "sha256:1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a"}, + {file = "sphinxcontrib_jquery-4.1-py2.py3-none-any.whl", hash = "sha256:f936030d7d0147dd026a4f2b5a57343d233f1fc7b363f68b3d4f1cb0993878ae"}, +] + +[package.dependencies] +Sphinx = ">=1.8" + [[package]] name = "sphinxcontrib-jsmath" version = "1.0.1" @@ -3318,4 +3318,4 @@ mark = ["banana-hep", "sqlalchemy"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "8b5d9197c2fd12a32c194dbd014a3eb42996da47c3f3663954ed872220dc5a8f" +content-hash = "f055e76b6dde63a9fcd6bed3122ea7fc3bab354052f8f5bab9eaf395394f02ec" diff --git a/pyproject.toml b/pyproject.toml index 7a76894d4..85fa687fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,12 +70,11 @@ pylint = "^3.1.0" optional = true [tool.poetry.group.docs.dependencies] -Sphinx = "^4.1.1" -sphinx-rtd-theme = "^0.5.2" -recommonmark = "^0.7.1" -sphinxcontrib-bibtex = "^2.3.0" +Sphinx = "^7.0.0" +sphinx-rtd-theme = "^1.0.0" +sphinxcontrib-bibtex = "^2.4.1" sphinxcontrib-details-directive = "^0.1.0" -nbsphinx = "^0.8.6" +nbsphinx = "^0.8.8" ipykernel = "^6.13.0" [tool.poetry.extras]