From ac5ea3fec9a990d504f31a670460ccbec2be10db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:09:14 +0000 Subject: [PATCH 1/6] Update sphinx requirement from <6,>=4 to >=4,<7 Updates the requirements on [sphinx](https://github.com/sphinx-doc/sphinx) to permit the latest version. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.0.0...v6.2.0) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ab038cb5..fb8c19a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ dependencies = [ "myst-parser~=0.18.0", "nbformat~=5.0", "pyyaml", - "sphinx>=4,<6", + "sphinx>=4,<7", "typing-extensions", # ipykernel is not a requirement of the library, # but is a common requirement for users (registers the python3 kernel) From dd8b78a51744f337d328948bc727208b8856cdbc Mon Sep 17 00:00:00 2001 From: Chris Holdgraf Date: Mon, 24 Apr 2023 01:53:53 -0700 Subject: [PATCH 2/6] Latest sphinx in tests --- .github/workflows/tests.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ae76b481..69c5b41e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,17 +27,18 @@ jobs: matrix: os: [ubuntu-latest] python-version: ["3.7", "3.8", "3.9", "3.10"] - sphinx: [">=5,<6"] + sphinx: [">=6,<7"] include: + # One test for an earlier Sphinx version - os: ubuntu-latest python-version: 3.7 - sphinx: ">=4,<5" + sphinx: ">=5,<6" - os: windows-latest python-version: 3.8 - sphinx: ">=5,<6" + sphinx: ">=6,<7" - os: macos-latest python-version: 3.8 - sphinx: ">=5,<6" + sphinx: ">=6,<7" runs-on: ${{ matrix.os }} From 699f0390d4cc6d33c26cbd1288f27df2483b50cd Mon Sep 17 00:00:00 2001 From: Chris Holdgraf Date: Mon, 24 Apr 2023 01:59:02 -0700 Subject: [PATCH 3/6] Update python version --- .github/workflows/tests.yml | 14 +++++++------- pyproject.toml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69c5b41e..f43dc1ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,10 +14,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.8 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: "3.10" - uses: pre-commit/action@v3.0.0 tests: @@ -26,18 +26,18 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.8", "3.10", "3.11"] sphinx: [">=6,<7"] include: # One test for an earlier Sphinx version - os: ubuntu-latest - python-version: 3.7 + python-version: 3.10 sphinx: ">=5,<6" - os: windows-latest - python-version: 3.8 + python-version: 3.10 sphinx: ">=6,<7" - os: macos-latest - python-version: 3.8 + python-version: 3.10 sphinx: ">=6,<7" runs-on: ${{ matrix.os }} @@ -83,7 +83,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: "3.10" - name: install flit run: | pip install flit~=3.4 diff --git a/pyproject.toml b/pyproject.toml index fb8c19a6..ad044dd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,10 +16,10 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries :: Python Modules", @@ -33,7 +33,7 @@ keywords = [ "docutils", "sphinx", ] -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "importlib_metadata", "ipython", From 72411492a22c2cb6ded25b61e89580c49e250b04 Mon Sep 17 00:00:00 2001 From: Chris Holdgraf Date: Mon, 24 Apr 2023 02:00:22 -0700 Subject: [PATCH 4/6] Quotes YAML --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f43dc1ce..7ba47f78 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,13 +31,13 @@ jobs: include: # One test for an earlier Sphinx version - os: ubuntu-latest - python-version: 3.10 + python-version: "3.10" sphinx: ">=5,<6" - os: windows-latest - python-version: 3.10 + python-version: "3.10" sphinx: ">=6,<7" - os: macos-latest - python-version: 3.10 + python-version: "3.10" sphinx: ">=6,<7" runs-on: ${{ matrix.os }} From 1f4793bccf58a24c49392816bed16aac2b5d2a15 Mon Sep 17 00:00:00 2001 From: Chris Holdgraf Date: Mon, 24 Apr 2023 02:06:59 -0700 Subject: [PATCH 5/6] Update .github/workflows/tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7ba47f78..3f2fa64c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: ["3.8", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10"] sphinx: [">=6,<7"] include: # One test for an earlier Sphinx version From e03eee052953d6005017287286673e8264d8aad9 Mon Sep 17 00:00:00 2001 From: Chris Holdgraf Date: Mon, 24 Apr 2023 02:07:12 -0700 Subject: [PATCH 6/6] Update pyproject.toml --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ad044dd0..47cfb0e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries :: Python Modules",