From f667a40ee20fc776c56764bad99f27a1d554703d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 08:44:51 -0600 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate (#10363) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 76b917970c7..5463b83d19e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -119,7 +119,7 @@ repos: exclude: >- ^CHANGES\.rst$ - repo: https://github.com/codespell-project/codespell - rev: v2.3.0 + rev: v2.4.0 hooks: - id: codespell additional_dependencies: From 3fb2c8dfcc8f52089cb48a1136d3e569d1ac73ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 29 Jan 2025 16:56:42 +0100 Subject: [PATCH 2/2] Fix sdist make (#10366) --- CHANGES/10366.packaging | 2 ++ MANIFEST.in | 1 + Makefile | 3 +++ tools/gen.py | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 CHANGES/10366.packaging diff --git a/CHANGES/10366.packaging b/CHANGES/10366.packaging new file mode 100644 index 00000000000..f0e9f62095a --- /dev/null +++ b/CHANGES/10366.packaging @@ -0,0 +1,2 @@ +Added missing files to the source distribution to fix ``Makefile`` targets. +Added a ``cythonize-nodeps`` target to run Cython without invoking pip to install dependencies. diff --git a/MANIFEST.in b/MANIFEST.in index d7c5cef6aad..64cee139a1f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,6 +7,7 @@ graft aiohttp graft docs graft examples graft tests +graft tools graft requirements recursive-include vendor * global-include aiohttp *.pyi diff --git a/Makefile b/Makefile index 0163b771b8a..dc49c1592ff 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,9 @@ generate-llhttp: .llhttp-gen .PHONY: cythonize cythonize: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c +.PHONY: cythonize-nodeps +cythonize-nodeps: $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c + .install-deps: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c $(call to-hash,$(CYS) $(REQS)) @python -m pip install -r requirements/dev.in -c requirements/dev.txt @touch .install-deps diff --git a/tools/gen.py b/tools/gen.py index d00780aa676..cc015043985 100755 --- a/tools/gen.py +++ b/tools/gen.py @@ -7,7 +7,7 @@ import multidict ROOT = pathlib.Path.cwd() -while ROOT.parent != ROOT and not (ROOT / ".git").exists(): +while ROOT.parent != ROOT and not (ROOT / "pyproject.toml").exists(): ROOT = ROOT.parent