From 57e6a10ef3b8385f65e52b88704bd38dca145cbe Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Thu, 18 Apr 2024 15:21:21 -0700 Subject: [PATCH] add defusedxml --- .github/workflows/ci.yml | 2 +- pyproject.toml | 23 +++++++++++++++-------- tox.ini | 7 +++++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48e2a65e..22c53a9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: - graphviz envs: | - macos: py311-sphinx6 - - windows: py310-sphinx56 + - windows: py310-sphinx6 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/pyproject.toml b/pyproject.toml index ec4ff90c..340024d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ dependencies = [ "invoke>=1.6.0", "packaging>=19.0", "python-dateutil>=2.8.2", - "sphinx>=5.0.0", + "sphinx>=6.0.0", "watchdog>=2.1.0", ] @@ -50,13 +50,20 @@ issue_tracker = "https://github.com/sunpy/ablog/issues" repository = "https://github.com/sunpy/ablog" [project.optional-dependencies] -all = ["ablog[markdown, notebook]"] -notebook =["ipython>=7.30.0", - "nbsphinx>=0.8.0"] -markdown =["myst-parser>=0.17.0"] -docs =["alabaster", - "sphinx-automodapi"] -tests =["pytest"] +all = ["ablog[markdown,notebook]"] +notebook = [ + "ipython>=7.30.0", + "nbsphinx>=0.8.0" +] +markdown = ["myst-parser>=0.17.0"] +docs = [ + "alabaster", + "sphinx-automodapi" +] +tests = [ + "pytest", + "defusedxml>=0.8.0rc2", +] [project.scripts] ablog = "ablog.commands:ablog_main" diff --git a/tox.ini b/tox.ini index f3f64a81..81710d14 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,9 @@ allowlist_externals = deps = pytest-cov extras = - dev + all + docs + tests commands = # Have to do this here as myst-parser in the install step forces the version. sphinx6: pip install -U "sphinx>=6.0,<7.0" @@ -27,7 +29,8 @@ deps = git+https://github.com/pydata/pydata-sphinx-theme.git pytest-cov extras = - dev + all + docs commands = rm -rf pydata-sphinx-theme || true git clone git@github.com:pydata/pydata-sphinx-theme.git --depth 1 pydata-sphinx-theme