From f6a95d3d0bbcd4b4c28e553d6ab0ce8f5f1901f3 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 13 Sep 2023 16:09:21 -0400 Subject: [PATCH 1/3] chore: Ruff ignore for _compat Signed-off-by: Henry Schreiner --- cibuildwheel/_compat/tomllib.py | 4 ++-- cibuildwheel/_compat/typing.py | 2 +- pyproject.toml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cibuildwheel/_compat/tomllib.py b/cibuildwheel/_compat/tomllib.py index f3b30fe6..62d601c6 100644 --- a/cibuildwheel/_compat/tomllib.py +++ b/cibuildwheel/_compat/tomllib.py @@ -3,8 +3,8 @@ from __future__ import annotations import sys if sys.version_info >= (3, 11): - from tomllib import load # noqa: TID251 + from tomllib import load else: - from tomli import load # noqa: TID251 + from tomli import load __all__ = ("load",) diff --git a/cibuildwheel/_compat/typing.py b/cibuildwheel/_compat/typing.py index a66b1abb..d1aa7227 100644 --- a/cibuildwheel/_compat/typing.py +++ b/cibuildwheel/_compat/typing.py @@ -5,7 +5,7 @@ import sys if sys.version_info < (3, 11): from typing_extensions import NotRequired, assert_never else: - from typing import NotRequired, assert_never # noqa: TID251 + from typing import NotRequired, assert_never __all__ = ( "assert_never", diff --git a/pyproject.toml b/pyproject.toml index 4368cd33..bf84836e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -161,3 +161,4 @@ flake8-unused-arguments.ignore-variadic-names = true [tool.ruff.per-file-ignores] "unit_test/*" = ["PLC1901"] +"cibuildwheel/_compat/**.py" = ["TID251"] From db6d3095b900649caa948e1348d71b8e4f2b894d Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 13 Sep 2023 16:09:56 -0400 Subject: [PATCH 2/3] chore: add .gitattributes Signed-off-by: Henry Schreiner --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..53363ffc --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +* text=auto + +*.py diff=python +*.md diff=markdown + +*.svg -diff From 753cbd1ca526543d317f0678fb5bc16018ed5ee9 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 18 Sep 2023 17:20:30 +0100 Subject: [PATCH 3/3] Update RtD config to include mandatory build.os option --- .readthedocs.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index b59f4199..7b94bd1f 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -2,13 +2,17 @@ # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details version: 2 -mkdocs: - configuration: mkdocs.yml +build: + os: ubuntu-22.04 + tools: + python: "3.11" python: - version: 3.8 install: - method: pip path: . extra_requirements: - docs + +mkdocs: + configuration: mkdocs.yml