Skip to content

Commit fb8212a

Browse files
[repo-helper] Configuration Update (#95)
* Updated files with 'repo_helper'. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 0dc8db8 commit fb8212a

8 files changed

Lines changed: 20 additions & 29 deletions

File tree

.github/workflows/octocheese.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
schedule:
77
- cron: 0 12 * * *
88

9+
permissions:
10+
contents: write
11+
912
jobs:
1013
Run:
1114
runs-on: ubuntu-latest

.github/workflows/python_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
- {python-version: "3.12", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
3737
- {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
3838
- {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
39-
- {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
40-
- {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},build", experimental: True}
39+
- {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}", experimental: False}
40+
- {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}", experimental: True}
4141

4242
steps:
4343
- name: Checkout 🛎️

.github/workflows/python_ci_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
3939
- {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
4040
- {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
41-
- {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},build", experimental: True}
41+
- {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}", experimental: True}
4242

4343
steps:
4444
- name: Checkout 🛎️
@@ -161,7 +161,7 @@ jobs:
161161
162162
- name: Upload distribution to PyPI 🚀
163163
if: startsWith(github.ref, 'refs/tags/')
164-
uses: pypa/gh-action-pypi-publish@v1.4.2
164+
uses: pypa/gh-action-pypi-publish@v1.13.0
165165
with:
166166
user: __token__
167167
password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/python_ci_macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.7", os-ver: "13", testenvs: "py37-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
31+
- {python-version: "3.7", os-ver: "15-intel", testenvs: "py37-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
3232
- {python-version: "3.8", os-ver: "14", testenvs: "py38-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
3333
- {python-version: "3.9", os-ver: "14", testenvs: "py39-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},build", experimental: False}
3434
- {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},build", experimental: False}
3535
- {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
3636
- {python-version: "3.12", os-ver: "14", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
3737
- {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
38-
- {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
38+
- {python-version: "pypy-3.7", os-ver: "15-intel", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
3939
- {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
40-
- {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},build", experimental: True}
40+
- {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}", experimental: True}
4141

4242
steps:
4343
- name: Checkout 🛎️

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ repos:
4343
- id: bind-requirements
4444

4545
- repo: https://github.com/python-formate/flake8-dunder-all
46-
rev: v0.4.1
46+
rev: v0.5.0
4747
hooks:
4848
- id: ensure-dunder-all
4949
files: ^sphinxcontrib.extras_require/.*\.py$
@@ -62,11 +62,11 @@ repos:
6262
- id: rst-inline-touching-normal
6363

6464
- repo: https://github.com/asottile/pyupgrade
65-
rev: v2.12.0
65+
rev: v3.3.0
6666
hooks:
6767
- id: pyupgrade
6868
args:
69-
- --py36-plus
69+
- --py37-plus
7070
- --keep-runtime-typing
7171

7272
- repo: https://github.com/Lucas-C/pre-commit-hooks

doc-source/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ git+https://github.com/sphinx-toolbox/sphinx-toolbox-experimental
22
default-values>=0.6.0
33
domdf-sphinx-theme>=0.3.0
44
html-section>=0.3.0
5+
roman>=4.0
56
seed-intersphinx-mapping>=1.2.2
67
sphinx-copybutton>=0.2.12
78
sphinx-debuginfo>=0.2.2

tests/test_directive.py

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,11 @@ def test_validate_requirements(requirements: List[str], valid_requirements: List
104104
)
105105
def test_validate_requirements_warning(requirements: List[str], valid_requirements: List[str]) -> None:
106106

107-
if sys.version_info < (3, 7):
108-
# Old packaging version
109-
warning_msg = "Creating a LegacyVersion has been deprecated and will be removed in the next major release"
110-
111-
with warnings.catch_warnings():
112-
warnings.simplefilter("always", DeprecationWarning)
113-
114-
with pytest.warns(DeprecationWarning, match=warning_msg):
115-
assert validate_requirements(requirements) == valid_requirements
116-
117-
with pytest.raises(ValueError, match=f"Invalid requirement .*: {warning_msg}"):
118-
validate_requirements(requirements)
119-
else:
120-
# New packaging version
121-
with pytest.raises(
122-
ValueError,
123-
match=rf"Invalid requirement .*: Expected end or semicolon \(after version specifier\)"
124-
):
125-
validate_requirements(requirements)
107+
# New packaging version
108+
with pytest.raises(
109+
ValueError, match=rf"Invalid requirement .*: Expected end or semicolon \(after version specifier\)"
110+
):
111+
validate_requirements(requirements)
126112

127113

128114
@pytest.mark.parametrize(

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ deps =
110110
flake8-sphinx-links>=0.0.4
111111
flake8-strftime>=0.1.1
112112
flake8-typing-imports>=1.10.0
113+
git+https://github.com/domdfcoding/restructuredtext-lint.git@fix-deprecations
113114
git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git
114115
git+https://github.com/domdfcoding/flake8-rst-docstrings.git
115116
git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods

0 commit comments

Comments
 (0)