Skip to content

Commit 819ce6b

Browse files
mathboumathbou
authored
Merge branch 'sphinx-toolbox:master' into feature/query_homepage
2 parents 90217a8 + a225b90 commit 819ce6b

25 files changed

+149
-97
lines changed

‎.github/workflows/cleanup.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.github/workflows/conda_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
python -VV
2929
python -m site
3030
python -m pip install --upgrade pip setuptools wheel
31-
python -m pip install --upgrade whey-conda
31+
python -m pip install --upgrade "whey-conda" "whey"
3232
# $CONDA is an environment variable pointing to the root of the miniconda directory
3333
$CONDA/bin/conda update -q conda
3434
$CONDA/bin/conda install conda-build=3.21.0

‎.github/workflows/docs_test_action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout 🛎️
20-
uses: "actions/checkout@v1"
20+
uses: "actions/checkout@v2"
2121

2222
- name: Check for changed files
2323
uses: dorny/paths-filter@v2

‎.github/workflows/python_ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: "windows-2019"
2222
continue-on-error: ${{ matrix.config.experimental }}
2323
env:
24-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
24+
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'
2525

2626
strategy:
2727
fail-fast: False
@@ -31,9 +31,11 @@ jobs:
3131
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3232
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3333
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
34-
- {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
34+
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
35+
- {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
3536
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3637
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
38+
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
3739

3840
steps:
3941
- name: Checkout 🛎️

‎.github/workflows/python_ci_linux.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: "ubuntu-20.04"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
25+
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'
2626

2727
strategy:
2828
fail-fast: False
@@ -32,9 +32,11 @@ jobs:
3232
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3333
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3434
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
35-
- {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
35+
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
36+
- {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
3637
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3738
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
39+
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
3840

3941
steps:
4042
- name: Checkout 🛎️
@@ -101,21 +103,26 @@ jobs:
101103
path: coverage
102104

103105
- name: Display structure of downloaded files
106+
id: show
104107
run: ls -R
105108
working-directory: coverage
109+
continue-on-error: true
106110

107111
- name: Combine Coverage 👷
112+
if: ${{ steps.show.outcome != 'failure' }}
108113
run: |
109114
shopt -s globstar
110115
python -m coverage combine coverage/**/.coverage
111116
112117
- name: "Upload Combined Coverage Artefact 🚀"
118+
if: ${{ steps.show.outcome != 'failure' }}
113119
uses: actions/upload-artifact@v2
114120
with:
115121
name: "combined-coverage"
116122
path: .coverage
117123

118124
- name: "Upload Combined Coverage to Coveralls"
125+
if: ${{ steps.show.outcome != 'failure' }}
119126
env:
120127
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
121128
run: |
@@ -173,7 +180,7 @@ jobs:
173180
- name: Install dependencies 🔧
174181
run: |
175182
python -m pip install --upgrade pip setuptools wheel
176-
python -m pip install --upgrade mkrecipe
183+
python -m pip install --upgrade "mkrecipe" "whey"
177184
178185
wget https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh -O miniconda.sh
179186
bash miniconda.sh -b -p $HOME/miniconda

‎.github/workflows/python_ci_macos.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: "macos-latest"
2222
continue-on-error: ${{ matrix.config.experimental }}
2323
env:
24-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
24+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.4,pypy-3.7,pypy-3.8'
2525

2626
strategy:
2727
fail-fast: False
@@ -31,9 +31,10 @@ jobs:
3131
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3232
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3333
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
34-
- {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
35-
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
34+
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
35+
- {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
3636
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
37+
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
3738

3839
steps:
3940
- name: Checkout 🛎️

‎.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
- id: end-of-file-fixer
3131

3232
- repo: https://github.com/domdfcoding/pre-commit-hooks
33-
rev: v0.2.1
33+
rev: v0.3.0
3434
hooks:
3535
- id: requirements-txt-sorter
3636
args:
@@ -40,7 +40,7 @@ repos:
4040
- id: bind-requirements
4141

4242
- repo: https://github.com/domdfcoding/flake8-dunder-all
43-
rev: v0.1.7
43+
rev: v0.1.8
4444
hooks:
4545
- id: ensure-dunder-all
4646
files: ^seed_intersphinx_mapping/.*\.py$
@@ -73,7 +73,7 @@ repos:
7373
- id: forbid-crlf
7474

7575
- repo: https://github.com/python-formate/snippet-fmt
76-
rev: v0.1.3
76+
rev: v0.1.4
7777
hooks:
7878
- id: snippet-fmt
7979

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ seed_intersphinx_mapping
109109
:target: https://github.com/sphinx-toolbox/seed_intersphinx_mapping/commit/master
110110
:alt: GitHub last commit
111111

112-
.. |maintained| image:: https://img.shields.io/maintenance/yes/2021
112+
.. |maintained| image:: https://img.shields.io/maintenance/yes/2022
113113
:alt: Maintenance
114114

115115
.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/seed_intersphinx_mapping

‎__pkginfo__.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎doc-source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ seed_intersphinx_mapping
114114
:last-commit:
115115
:alt: GitHub last commit
116116

117-
.. |maintained| maintained-shield:: 2021
117+
.. |maintained| maintained-shield:: 2022
118118
:alt: Maintenance
119119

120120
.. |pypi-downloads| pypi-shield::

0 commit comments

Comments
 (0)