sphinx-external-toc-strict 2.0.2__tar.gz → 2.0.3.post3__tar.gz

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/branch-test-others.yml

@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: "Install ${{ matrix.python-version }} with setup-python"
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: "${{ matrix.python-version }}"
           allow-prereleases: true
@@ -59,7 +59,7 @@ jobs:
       - name: "Install dependencies"
         run: |
           set -xe
-          python -m pip install 'pip<24.2' -r requirements/tox.pip
+          python -m pip install -r requirements/tox.pip # 'pip<24.2'
 
       - name: "Run tox for ${{ matrix.python-version }}"
         run: |

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/dependency-review.yml

@@ -1,7 +1,7 @@
 # Dependency Review Action
 #
 # This Action will scan dependency manifest files that change as part
-# of a Pull Reqest, surfacing known-vulnerable versions of the packages
+# of a Pull Request, surfacing known-vulnerable versions of the packages
 # declared or updated in the PR. Once installed, if the workflow run is
 # marked as required, PRs introducing known-vulnerable packages will be
 # blocked from merging.
@@ -29,7 +29,7 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4.2.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4.5.0
+        uses: actions/dependency-review-action@v4.7.1
         with:
           base-ref: ${{ github.event.pull_request.base.sha || 'main' }}
           head-ref: ${{ github.event.pull_request.head.sha || github.ref }}

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/kit.yml

@@ -140,13 +140,13 @@ jobs:
           platforms: arm64
 
       - name: "Check out the repo"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
         with:
           # fetch all branches and tags instead of only fetching the ref/SHA that triggered the workflow
           fetch-depth: 0
 
       - name: "Install Python 3.10"
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.6.0
         with:
           # PYVERSIONS
           python-version: "3.10"
@@ -182,7 +182,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check out the repo"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
         with:
           # fetch all branches and tags instead of only fetching the ref/SHA that triggered the workflow
           fetch-depth: 0
@@ -195,7 +195,7 @@ jobs:
           echo "tag=$(git describe --tags)" >> $GITHUB_OUTPUT
 
       - name: "Install Python 3.10"
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.6.0
         with:
           # PYVERSIONS
           python-version: "3.10"
@@ -210,7 +210,9 @@ jobs:
         env:
           RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
         run: |
-          echo "python igor.py build_next $RELEASE_VERSION"
+          echo "build $RELEASE_VERSION"
+          echo "Before build, generate _version.py, not saved in vcs"
+          echo "without _version.py build would fail"
           python igor.py build_next "$RELEASE_VERSION"
 
       - name: "List tarballs"
@@ -229,13 +231,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check out the repo"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
         with:
           # fetch all branches and tags instead of only fetching the ref/SHA that triggered the workflow
           fetch-depth: 0
 
       - name: "Install PyPy"
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: "pypy-3.10" # Minimum of PyPy PYVERSIONS
           # cache: pip

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/python-nightly.yml

@@ -30,7 +30,7 @@ concurrency:
 
 jobs:
   tests:
-    name: "${{ matrix.python-version }} on ${{ matrix.os-short }}"
+    name: "${{ matrix.python-version }} on ${{ matrix.os }}"
     runs-on: "${{ matrix.os }}"
     # If it doesn't finish in an hour, it's not going to. Don't spin for six
     # hours needlessly.
@@ -47,9 +47,7 @@ jobs:
           # See https://github.com/deadsnakes/nightly for the source of the nightly
           # builds.
           # bionic: 18, focal: 20, jammy: 22, noble: 24
-          - "ubuntu-22.04"
-        os-short:
-          - "ubuntu"
+          - ubuntu-latest
         python-version:
           # When changing this list, be sure to check the [gh] list in
           # tox.ini so that tox will run properly. PYVERSIONS
@@ -74,7 +72,7 @@ jobs:
           python-version: "${{ matrix.python-version }}"
 
       - name: "Install ${{ matrix.python-version }} with setup-python"
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.6.0
         if: "startsWith(matrix.python-version, 'pypy-')"
         with:
           python-version: "${{ matrix.python-version }}"
@@ -88,7 +86,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          python -m pip install 'pip<24.2' -r requirements/tox.pip
+          python -m pip install -r requirements/tox.pip # 'pip<24.2'
 
       - name: "Run tox"
         run: |

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/quality.yml

@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: "Install Python"
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: "3.10" # Minimum of PYVERSIONS
           # cache: pip
@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: "Install Python"
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: "3.10" # Minimum of PYVERSIONS, but at least 3.9
           # cache: pip
@@ -87,9 +87,9 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: "Install Python"
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.6.0
         with:
-          python-version: "3.10" # Doc version from PYVERSIONS
+          python-version: "3.13" # Doc version from PYVERSIONS
           # cache: pip
           cache-dependency-path: 'requirements/*.pip'
 

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/release.yml

@@ -19,6 +19,7 @@ defaults:
 env:
   PIP_DISABLE_PIP_VERSION_CHECK: 1
   DEST_FOLDER: dist/
+  dists-artifact-name: python-package-distributions
 
 permissions:
   contents: read  # This is required for actions/checkout
@@ -42,27 +43,31 @@ jobs:
         echo "tag=$(git describe --tags)" >> $GITHUB_OUTPUT
 
     - name: Install py310
-      uses: actions/setup-python@v5.3.0
+      uses: actions/setup-python@v5.6.0
       with:
         python-version: "3.10"
         # cache: pip
         # cache-dependency-path: 'requirements/*.pip'
 
+    # Will fail without: build wheel and setuptools-scm
+    # Build environment top level dependencies should never be in dependency files
     - name: "Install tools"
       run: |
-        python -m pip install --upgrade -r requirements/kit.pip
+        python -m pip install --upgrade build wheel setuptools-scm -r requirements/kit.pip
 
     - name: build
       env:
         RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
       run: |
-        echo "python igor.py build_next $RELEASE_VERSION"
+        echo "build $RELEASE_VERSION"
+        echo "Before build, generate _version.py, not saved in vcs"
+        echo "without _version.py build would fail"
         python igor.py build_next "$RELEASE_VERSION"
 
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v4.5.0
+      uses: actions/upload-artifact@v4.6.2
       with:
-        name: python-package-distributions
+        name: ${{ env.dists-artifact-name }}
         path: ${{ env.DEST_FOLDER }}
 
   publish-to-pypi:
@@ -80,9 +85,9 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4.1.8
+      uses: actions/download-artifact@v4.3.0
       with:
-        name: python-package-distributions
+        name: ${{ env.dists-artifact-name }}
         path: ${{ env.DEST_FOLDER }}
 
     - name: Publish package
@@ -104,9 +109,9 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4.1.8
+      uses: actions/download-artifact@v4.3.0
       with:
-        name: python-package-distributions
+        name: ${{ env.dists-artifact-name }}
         path: ${{ env.DEST_FOLDER }}
     - name: Sign the dists with Sigstore
       uses: sigstore/gh-action-sigstore-python@v3.0.0
@@ -149,9 +154,9 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4.1.8
+      uses: actions/download-artifact@v4.3.0
       with:
-        name: python-package-distributions
+        name: ${{ env.dists-artifact-name }}
         path: ${{ env.DEST_FOLDER }}
 
     - name: Publish distribution to TestPyPI

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/test-coverage.yml

@@ -58,7 +58,7 @@ jobs:
         run: |
           echo "tag=$(git describe --tags)" >> $GITHUB_OUTPUT
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: "${{ matrix.python-version }}"
           # cache: pip
@@ -73,10 +73,12 @@ jobs:
       - name: "Build sdist and whl"
         env:
           RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
+        # echo "python igor.py build_next $RELEASE_VERSION"
+        # python igor.py build_next "$RELEASE_VERSION"
         run: |
           set -xe
-          echo "python igor.py build_next $RELEASE_VERSION"
-          python igor.py build_next "$RELEASE_VERSION"
+          echo "VERSION $RELEASE_VERSION"
+
       - name: "Install"
         run: |
           set -xe
@@ -89,7 +91,7 @@ jobs:
           python -m coverage combine
           python -m coverage xml --fail-under=90
       - name: "Upload to Codecov"
-        uses: codecov/codecov-action@v5.1.2
+        uses: codecov/codecov-action@v5.4.3
         with:
           name: unittest-py3.10
           token: ${{ secrets.CODECOV_TOKEN }}

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.github/workflows/testsuite.yml

@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: "Set up Python"
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: "${{ matrix.python-version }}"
           allow-prereleases: true
@@ -85,7 +85,7 @@ jobs:
       - name: "Install dependencies"
         run: |
           set -xe
-          python -m pip install 'pip<24.2' -r requirements/tox.pip
+          python -m pip install -r requirements/tox.pip # 'pip<24.2'
 
       - name: "Run tox for ${{ matrix.python-version }}"
         run: |

sphinx_external_toc_strict-2.0.3.post3/.pre-commit-config.yaml

@@ -0,0 +1,68 @@
+# Install pre-commit hooks via
+# pre-commit install
+
+exclude: >
+    (?x)^(
+      \.vscode/settings\.json|
+      tests/.*xml|
+      tests/.*txt|
+    )$
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+  - id: check-merge-conflict
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-docstring-first
+  - id: check-json
+  - id: check-yaml
+  - id: debug-statements
+
+- repo: https://github.com/crate-ci/typos
+  rev: v1
+  hooks:
+  - id: typos
+
+- repo: https://github.com/abravalheri/validate-pyproject
+  rev: v0.24.1
+  hooks:
+  - id: validate-pyproject
+
+- repo: https://github.com/psf/black
+  rev: 25.1.0
+  hooks:
+  - id: black
+
+- repo: https://github.com/keewis/blackdoc
+  rev: v0.3.9
+  hooks:
+  - id: blackdoc
+    additional_dependencies: ["black==25.1.0"]
+  - id: blackdoc-autoupdate-black
+
+- repo: https://github.com/PyCQA/flake8
+  rev: 7.2.0
+  hooks:
+  - id: flake8
+    args: ["--ignore=E203,W503,W605,W293,W291,E501"]
+
+- repo: https://github.com/PyCQA/isort
+  rev: 6.0.1
+  hooks:
+  - id: isort
+
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.15.0
+  hooks:
+  - id: mypy
+    pass_filenames: false
+    entry: mypy src/sphinx_external_toc_strict/
+
+- repo: https://github.com/econchick/interrogate
+  rev: 1.7.0  # or master if you're bold
+  hooks:
+  - id: interrogate
+    args: ["-v", "--fail-under=100", "--omit-covered-files"]
+    pass_filenames: false  # needed if excluding files with pyproject.toml

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/.readthedocs.yml

@@ -4,7 +4,7 @@ build:
   os: ubuntu-22.04
   tools:
     # PYVERSIONS: the version we use for building docs. Check tox.ini[doc] also.
-    python: "3.10"
+    python: "3.13"
   jobs:
     pre_build:
     - |

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/CHANGES.rst

@@ -8,6 +8,20 @@ Changelog
    Feature request
    .................
 
+   - Like python -m build add -o option to `python igor.py build_next "current"`
+
+   - tests/test_util/sphinx_conftest.py:88, during tests, patches
+     sphinx.util.requests._Session.request
+     This causes Sphinx API deprecation warnings:
+
+     sphinx.util.FilenameUniqDict and sphinx.util.DownloadFiles
+
+     In sphinx, search for tls_cacerts, tls_verify, and user_agent.
+     Find where package requests is used and short-circuit
+
+     Is this related?
+     https://www.sphinx-doc.org/en/master/_modules/sphinx/addnodes.html#download_reference
+
    - migrate docs from rtd --> gh pages
 
    - https://allcontributors.org/
@@ -28,6 +42,30 @@ Changelog
 
 .. scriv-start-here
 
+.. _changes_2-0-3.post1:
+
+Version 2.0.3.post1 — 2025-05-19
+--------------------------------
+
+- refactor: remove setup.py
+- fix: tox dependency pyproject-api requires bump tomli
+
+.. _changes_2-0-3.post0:
+
+Version 2.0.3.post0 — 2025-05-18
+--------------------------------
+
+- fix: bump setuptools-scm to pep639 license expression support
+
+.. _changes_2-0-3:
+
+Version 2.0.3 — 2025-05-18
+--------------------------
+
+- chore(re-commit): add repo typos
+- chore: remove pip and setuptools pins
+- ci: bump versions
+
 .. _changes_2-0-2:
 
 Version 2.0.2 — 2025-01-05

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/MANIFEST.in

@@ -1,2 +1,3 @@
 prune tests/roots/test-root/_build
 prune tests/roots/test-skeleton/_build
+exclude *.bak

{sphinx_external_toc_strict-2.0.2 → sphinx_external_toc_strict-2.0.3.post3}/Makefile

@@ -37,7 +37,7 @@ ifeq ($(is_venv),1)
   is_wheel ?= $(call IS_PACKAGE,wheel)
   is_piptools ?= $(call IS_PACKAGE,pip-tools)
 
-  find_whl = $(shell [[ -z "$(3)" ]] && extention=".whl" || extention="$(3)"; [[ -z "$(2)" ]] && srcdir="dist" || srcdir="$(2)/dist"; [[ -z "$(1)" ]] && whl=$$(ls $$srcdir/$(APP_NAME)*.whl  --format="single-column") || whl=$$(ls $$srcdir/$(1)*.whl --format="single-column"); echo $${whl##*/})
+  find_whl = $(shell [[ -z "$(3)" ]] && extension=".whl" || extension="$(3)"; [[ -z "$(2)" ]] && srcdir="dist" || srcdir="$(2)/dist"; [[ -z "$(1)" ]] && whl=$$(ls $$srcdir/$(APP_NAME)*.whl  --format="single-column") || whl=$$(ls $$srcdir/$(1)*.whl --format="single-column"); echo $${whl##*/})
 endif
 
 ##@ Helpers
@@ -152,20 +152,6 @@ ifeq ($(is_venv),1)
 	$(VENV_BIN_PYTHON) -m flake8 tests/
 endif
 
-# --cov-report=xml
-# Dependencies: pytest, pytest-cov, pytest-regressions
-# make [v=1] coverage
-# @$(VENV_BIN)/pytest --showlocals --cov=sphinx_external_toc_strict --cov-report=term-missing tests
-.PHONY: coverage
-coverage: private verbose_text = $(if $(v),"--verbose")
-coverage:				## Run tests, generate coverage reports -- make [v=1] coverage
-ifeq ($(is_venv),1)
-	-@$(VENV_BIN_PYTHON) -m coverage erase
-	$(VENV_BIN_PYTHON) -m coverage run --parallel -m pytest --showlocals $(verbose_text) tests
-	$(VENV_BIN_PYTHON) -m coverage combine
-	$(VENV_BIN_PYTHON) -m coverage report --fail-under=90
-endif
-
 ##@ Kitting
 # Initial build
 # mkdir dist/ ||:; python -m build --outdir dist/ .
@@ -175,7 +161,7 @@ REPO_OWNER := msftcangoblowm/sphinx-external-toc-strict
 REPO := $(REPO_OWNER)/sphinx_external_toc_strict
 
 .PHONY: edit_for_release cheats relbranch kit_check kit_build kit_upload
-.PHONY: test_upload kits_build kits_download github_releases
+.PHONY: test_upload kits_download github_releases
 
 edit_for_release:               ## Edit sources to insert release facts (see howto.txt)
 	python igor.py edit_for_release
@@ -191,9 +177,6 @@ kit_check:                              ## Check that dist/* are well-formed
 	python -m twine check dist/*
 	@echo $$(ls -1 dist | wc -l) distribution kits
 
-kit_build:                              ## Make the source distribution
-	python igor.py build_next ""
-
 kit_upload:                             ## Upload the built distributions to PyPI
 	twine upload --verbose dist/*
 
@@ -209,6 +192,13 @@ kits_download:                  ## Download the built kits from GitHub
 github_releases: $(DOCBIN)              ## Update GitHub releases.
 	$(DOCBIN)/python -m scriv github-release --all
 
+##@ GNU Make standard targets
+
+# kind tag current or semantic version str
+.PHONY: build
+build:				## Make the source distribution
+	@python igor.py build_next ""
+
 .PHONY: install
 install: override usage := make [force=1]
 install: override check_web := Install failed. Possible cause no web connection
@@ -230,3 +220,17 @@ endif
 .PHONY: install-force
 install-force: force := 1
 install-force: install	## Force install even if exact same version
+
+# --cov-report=xml
+# Dependencies: pytest, pytest-cov, pytest-regressions
+# make [v=1] check
+# @$(VENV_BIN)/pytest --showlocals --cov=sphinx_external_toc_strict --cov-report=term-missing tests
+.PHONY: check
+check: private verbose_text = $(if $(v),"--verbose")
+check:					## Run tests, generate coverage reports -- make [v=1] coverage
+ifeq ($(is_venv),1)
+	-@$(VENV_BIN_PYTHON) -m coverage erase
+	$(VENV_BIN_PYTHON) -m coverage run --parallel -m pytest --showlocals $(verbose_text) tests
+	$(VENV_BIN_PYTHON) -m coverage combine
+	$(VENV_BIN_PYTHON) -m coverage report --fail-under=90
+endif