Skip to content

Commit

Permalink
Merge branch 'master' into search-icons
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGES.rst
  • Loading branch information
AA-Turner committed Aug 11, 2024
2 parents bbccc5e + be73e64 commit eb8db20
Show file tree
Hide file tree
Showing 390 changed files with 194,007 additions and 172,546 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade "flake8>=3.5.0"
python -m pip install --upgrade "flake8>=6.0"
- name: Lint with flake8
run: flake8 .

Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ env:
FORCE_COLOR: "1"
PYTHONDEVMODE: "1" # -X dev
PYTHONWARNDEFAULTENCODING: "1" # -X warn_default_encoding
UV_SYSTEM_PYTHON: "1" # make uv do global installs

jobs:
ubuntu:
Expand Down Expand Up @@ -124,6 +125,38 @@ jobs:
DO_EPUBCHECK: "1"
EPUBCHECK_PATH: "/tmp/epubcheck/epubcheck-5.1.0/epubcheck.jar"

oldest-supported:
runs-on: ubuntu-latest
name: Oldest supported

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3"
- name: Check Python version
run: python --version --version
- name: Install graphviz
run: sudo apt-get install graphviz
- name: Install uv
run: >
curl
--location
--fail
--proto '=https' --tlsv1.2
--silent --show-error
https://astral.sh/uv/install.sh
| sh
- name: Install dependencies
run: |
uv pip install .[test] --resolution lowest-direct
uv pip install alabaster==1.0.0
- name: Test with pytest
run: python -m pytest -vv --durations 25
env:
PYTHONWARNINGS: "error" # treat all warnings as errors

latex:
runs-on: ubuntu-latest
name: LaTeX
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ on:
- ".github/workflows/nodejs.yml"
- "sphinx/themes/**.js"
- "tests/js/**"
- "karma.conf.js"
- "package.json"
- "package-lock.json"
pull_request:
paths:
- ".github/workflows/nodejs.yml"
- "sphinx/themes/**.js"
- "tests/js/**"
- "karma.conf.js"
- "package.json"
- "package-lock.json"

Expand Down
20 changes: 16 additions & 4 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Christian Clauss <cclauss@me.com> <cclauss@bluewin.ch>
Daniel Eades <danieleades@hotmail.com>
Daniel Eades <danieleades@hotmail.com> <daniel.eades@hotmail.com>
Daniel Eades <danieleades@hotmail.com> <33452915+danieleades@users.noreply.github.com>
Daniel Eades <danieleades@hotmail.com> <daniel.eades@seebyte.com>

# Daniel Hahler (https://github.com/blueyed)
Daniel Hahler <git@thequod.de> <github@thequod.de>
Expand All @@ -37,6 +38,9 @@ Daniel Neuhäuser <dasdasich@gmail.com> <ich@danielneuhaeuser.de>

David Ham <David.Ham@imperial.ac.uk> <David,Ham@imperial.ac.uk>

# Dimitri Papadopoulos Orfanos (https://github.com/DimitriPapadopoulos)
Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com>

# Dmitry Shachnev (https://github.com/mitya57)
Dmitry Shachnev <mitya57@users.noreply.github.com> <mitya57@gmail.com>

Expand All @@ -55,10 +59,15 @@ Eric Knibbe <eric3knibbe@gmail.com> <eric@lassosoft.com>

# Hugo van Kemenade (https://github.com/hugovk)
Hugo van Kemenade <hugovk@users.noreply.github.com>

Hugo van Kemenade <hugovk@users.noreply.github.com> <1324225+hugovk@users.noreply.github.com>
# Ignacio Fdez. Galván (https://github.com/Jellby)
Ignacio Fdez. Galván <jellby@yahoo.com>

# Jacob Mason (https://github.com/jacobmason)
Jacob Mason <jacoblmason@gmail.com>
Jacob Mason <jacoblmason@gmail.com> <jacob@panda>
Jacob Mason <jacoblmason@gmail.com> <jacob@panther>

# Jakob Lykke Andersen (https://github.com/jakobandersen)
Jakob Lykke Andersen <Jakob@caput.dk> <jakobandersen@users.noreply.github.com>
Jakob Lykke Andersen <Jakob@caput.dk> <jakob@caput.dk>
Expand All @@ -68,9 +77,9 @@ Jakub Wilk <jwilk@jwilk.net> <jwilk@debian.org>
James Hilton-Balfe <gobot1234yt@gmail.com> <50501825+Gobot1234@users.noreply.github.com>

# Jean-François B. (https://github.com/jfbu)
Jean-François B. <jfbu@free.fr>
Jean-François B. <jfbu@free.fr> <jfbu@users.noreply.github.com>
Jean-François B. <jfbu@free.fr> <2589111+jfbu@users.noreply.github.com>
Jean-François B. <jfbu@users.noreply.github.com>
Jean-François B. <jfbu@users.noreply.github.com> <jfbu@users.noreply.github>
Jean-François B. <jfbu@users.noreply.github.com> <2589111+jfbu@users.noreply.github.com>

Jean Abou-Samra <jean@abou-samra.fr>

Expand All @@ -87,6 +96,9 @@ Justin Mathews <justin.mathews@isara.com> <jamathews@users.noreply.github.com>
# Justus Magin (https://github.com/keewis)
Justus Magin <keewis@posteo.de>

# KINEBUCHI Tomohiko (https://github.com/cocoatomo)
KINEBUCHI Tomohiko <cocoatomo77@gmail.com>

Latosha Maltba <79100569+latosha-maltba@users.noreply.github.com>

# Louis Maddox (https://github.com/lmmx)
Expand Down
19 changes: 4 additions & 15 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
target-version = "py310" # Pin Ruff to Python 3.10
line-length = 95
line-length = 88
output-format = "full"

extend-exclude = [
Expand Down Expand Up @@ -427,6 +427,9 @@ select = [
"ANN", # utilities don't need annotations
]

[lint.pycodestyle]
max-line-length = 95

[lint.flake8-quotes]
inline-quotes = "single"

Expand Down Expand Up @@ -482,18 +485,4 @@ exclude = [
"sphinx/transforms/*",
"sphinx/util/*",
"sphinx/writers/*",
"tests/*",
"tests/roots/*",
"tests/test_builders/*",
"tests/test_config/*",
"tests/test_directives/*",
"tests/test_domains/*",
"tests/test_environment/*",
"tests/test_extensions/*",
"tests/test_intl/*",
"tests/test_markup/*",
"tests/test_pycode/*",
"tests/test_transforms/*",
"tests/test_util/*",
"tests/test_writers/*",
]
Loading

0 comments on commit eb8db20

Please sign in to comment.