Merge branch 'sphinx-toolbox:master' into feature/query_homepage

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.0
+current_version = 1.0.1
 commit = True
 tag = True
 

.github/milestones.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+# stdlib
+import os
+import sys
+
+# 3rd party
+from github3 import GitHub
+from github3.repos import Repository
+from packaging.version import InvalidVersion, Version
+
+latest_tag = os.environ["GITHUB_REF_NAME"]
+
+try:
+	current_version = Version(latest_tag)
+except InvalidVersion:
+	sys.exit()
+
+gh: GitHub = GitHub(token=os.environ["GITHUB_TOKEN"])
+repo: Repository = gh.repository(*os.environ["GITHUB_REPOSITORY"].split('/', 1))
+
+for milestone in repo.milestones(state="open"):
+	try:
+		milestone_version = Version(milestone.title)
+	except InvalidVersion:
+		continue
+	if milestone_version == current_version:
+		sys.exit(not milestone.update(state="closed"))

.github/workflows/conda_ci.yml

@@ -13,6 +13,9 @@ jobs:
   tests:
     name: "Conda"
     runs-on: ubuntu-18.04
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
       - name: Checkout 🛎️
@@ -23,16 +26,20 @@ jobs:
         with:
           python-version: "3.8"
 
+      - name: Setup Conda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: env
+          conda-build-version: 3.21.0
+
       - name: Install dependencies 🔧
         run: |
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade "whey-conda" "whey"
           # $CONDA is an environment variable pointing to the root of the miniconda directory
-          $CONDA/bin/conda update -q conda
-          $CONDA/bin/conda install conda-build=3.21.0
-
+          $CONDA/bin/conda update -n base conda
           $CONDA/bin/conda config --add channels conda-forge
           $CONDA/bin/conda config --add channels domdfcoding
 
@@ -48,10 +55,11 @@ jobs:
 
       - name: "Install package"
         run: |
-          $CONDA/bin/conda install -c file://$(pwd)/conda-bld seed_intersphinx_mapping=1.0.0=py_1 -y || exit 1
+          $CONDA/bin/conda install -c file://$(pwd)/conda-bld seed_intersphinx_mapping=1.0.1=py_1 -y || exit 1
 
       - name: "Run Tests"
         run: |
           rm -rf seed_intersphinx_mapping
-          $CONDA/bin/pip install -r tests/requirements.txt
-          $CONDA/bin/pytest tests/
+          $CONDA/bin/conda install pytest coincidence || exit 1
+          pip install -r tests/requirements.txt
+          pytest tests/

.github/workflows/python_ci.yml

@@ -13,6 +13,7 @@ on:
 
 permissions:
   actions: write
+  issues: write
   contents: read
 
 jobs:
@@ -21,7 +22,7 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8'
 
     strategy:
       fail-fast: False
@@ -32,7 +33,7 @@ jobs:
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
-          - {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
+          - {python-version: "3.11.0-alpha.6", testenvs: "py311-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}

.github/workflows/python_ci_linux.yml

@@ -14,6 +14,7 @@ on:
 
 permissions:
   actions: write
+  issues: write
   contents: read
 
 jobs:
@@ -22,7 +23,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8'
 
     strategy:
       fail-fast: False
@@ -33,7 +34,7 @@ jobs:
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
-          - {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
+          - {python-version: "3.11.0-alpha.6", testenvs: "py311-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
@@ -139,21 +140,21 @@ jobs:
 
       - name: Setup Python 🐍
         uses: "actions/setup-python@v2"
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           python-version: 3.8
-        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Install dependencies 🔧
+        if: startsWith(github.ref, 'refs/tags/')
         run: |
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade tox
-        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Build distributions 📦
+        if: startsWith(github.ref, 'refs/tags/')
         run: |
           tox -e build
 
-        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Upload distribution to PyPI 🚀
         if: startsWith(github.ref, 'refs/tags/')
@@ -163,6 +164,15 @@ jobs:
           password: ${{ secrets.PYPI_TOKEN }}
           skip_existing: true
 
+      - name: Close milestone 🚪
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          python -m pip install --upgrade github3.py packaging
+          python .github/milestones.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
 
   Conda:
     needs: deploy
@@ -177,22 +187,46 @@ jobs:
         with:
           python-version: 3.8
 
+      - name: Setup Conda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: env
+          conda-build-version: 3.21.0
+
       - name: Install dependencies 🔧
         run: |
+          python -VV
+          python -m site
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade "mkrecipe" "whey"
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          $CONDA/bin/conda config --set always_yes yes --set changeps1 no
+          $CONDA/bin/conda update -n base conda
+          $CONDA/bin/conda info -a
+          $CONDA/bin/conda config --add channels conda-forge
+          $CONDA/bin/conda config --add channels domdfcoding
 
-          wget https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh -O miniconda.sh
-          bash miniconda.sh -b -p $HOME/miniconda
+          $CONDA/bin/conda config --remove channels defaults
 
-      - name: Build Conda 📦
+      - name: Build Conda Package 📦
         run: |
-          chmod +x .github/actions_build_conda.sh
-          bash .github/actions_build_conda.sh
+          python -m mkrecipe --type wheel || exit 1
+          $CONDA/bin/conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist
 
-      - name: Deploy Conda 🚀
+      - name: Deploy Conda Package 🚀
+        if: startsWith(github.ref, 'refs/tags/')
         run: |
-          chmod +x .github/actions_deploy_conda.sh
-          bash .github/actions_deploy_conda.sh
+          $CONDA/bin/conda config --set always_yes yes --set changeps1 no
+          $CONDA/bin/conda install anaconda-client
+          $CONDA/bin/conda info -a
+
+          for f in conda/dist/noarch/seed_intersphinx_mapping-*.tar.bz2; do
+            [ -e "$f" ] || continue
+            echo "$f"
+            conda install "$f" || exit 1
+            echo "Deploying to Anaconda.org..."
+            $CONDA/bin/anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
+            echo "Successfully deployed to Anaconda.org."
+          done
         env:
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}

.github/workflows/python_ci_macos.yml

@@ -13,6 +13,7 @@ on:
 
 permissions:
   actions: write
+  issues: write
   contents: read
 
 jobs:
@@ -21,7 +22,7 @@ jobs:
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.4,pypy-3.7,pypy-3.8'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.6,pypy-3.7,pypy-3.8'
 
     strategy:
       fail-fast: False
@@ -32,7 +33,7 @@ jobs:
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
-          - {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
+          - {python-version: "3.11.0-alpha.6", testenvs: "py311-dev,build", experimental: True}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
 

.pre-commit-config.yaml

@@ -67,7 +67,7 @@ repos:
        - --keep-runtime-typing
 
  - repo: https://github.com/Lucas-C/pre-commit-hooks
-   rev: v1.1.10
+   rev: v1.1.11
    hooks:
     - id: remove-crlf
     - id: forbid-crlf

README.rst

@@ -101,7 +101,7 @@ seed_intersphinx_mapping
 .. |language| image:: https://img.shields.io/github/languages/top/sphinx-toolbox/seed_intersphinx_mapping
 	:alt: GitHub top language
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/sphinx-toolbox/seed_intersphinx_mapping/v1.0.0
+.. |commits-since| image:: https://img.shields.io/github/commits-since/sphinx-toolbox/seed_intersphinx_mapping/v1.0.1
 	:target: https://github.com/sphinx-toolbox/seed_intersphinx_mapping/pulse
 	:alt: GitHub commits since tagged version
 

doc-source/index.rst

@@ -107,7 +107,7 @@ seed_intersphinx_mapping
 		:alt: GitHub top language
 
 	.. |commits-since| github-shield::
-		:commits-since: v1.0.0
+		:commits-since: v1.0.1
 		:alt: GitHub commits since tagged version
 
 	.. |commits-latest| github-shield::

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "whey"
 
 [project]
 name = "seed_intersphinx_mapping"
-version = "1.0.0"
+version = "1.0.1"
 description = "Populate the Sphinx 'intersphinx_mapping' dictionary from the project's requirements."
 readme = "README.rst"
 keywords = [ "documentation", "intersphinx", "sphinx",]

repo_helper.yml

@@ -7,7 +7,7 @@ email: 'dominic@davis-foster.co.uk'
 username: 'sphinx-toolbox'
 assignee: 'domdfcoding'
 primary_conda_channel: 'domdfcoding'
-version: '1.0.0'
+version: '1.0.1'
 license: 'MIT'
 short_desc: "Populate the Sphinx 'intersphinx_mapping' dictionary from the project's requirements."
 

seed_intersphinx_mapping/__init__.py

@@ -53,7 +53,7 @@
 __author__: str = "Dominic Davis-Foster"
 __copyright__: str = "2020 Dominic Davis-Foster"
 __license__: str = "MIT License"
-__version__: str = "1.0.0"
+__version__: str = "1.0.1"
 __email__: str = "dominic@davis-foster.co.uk"
 
 __all__ = ["get_sphinx_doc_url", "fallback_mapping", "seed_intersphinx_mapping"]

tox.ini

@@ -30,9 +30,8 @@ envlist =
 skip_missing_interpreters = True
 isolated_build = True
 requires =
-    pip>=20.3.3
+    pip>=21
     tox-envlist>=0.2.1
-    tox-pip-version>=0.0.7
 
 [envlists]
 test = py36, py37, py38, py39, py310, py311-dev, pypy36, pypy37, pypy38
@@ -42,7 +41,6 @@ cov = py36, coverage
 [testenv:docs]
 setenv = SHOW_TODOS = 1
 basepython = python3.8
-pip_version = pip>=21
 changedir = {toxinidir}/doc-source
 deps = -r{toxinidir}/doc-source/requirements.txt
 commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs}