From e4767782c70ca8427184694589d9f0ded5eeed22 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 29 Dec 2024 10:41:38 +0100 Subject: [PATCH] fix: remove explicit installation of setuptools (#278) --- .github/workflows/node-gyp.yml | 2 +- .github/workflows/python_tests.yml | 2 +- docs/Hacking.md | 2 +- pylib/gyp/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node-gyp.yml b/.github/workflows/node-gyp.yml index 4382979..400e233 100644 --- a/.github/workflows/node-gyp.yml +++ b/.github/workflows/node-gyp.yml @@ -33,7 +33,7 @@ jobs: - name: Install Python dependencies run: | cd gyp-next - python -m pip install --upgrade pip setuptools + python -m pip install --upgrade pip pip install --editable . pip uninstall -y gyp-next - name: Install Node.js dependencies diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index 507d4d2..0f225e5 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -26,7 +26,7 @@ jobs: - uses: seanmiddleditch/gha-setup-ninja@v5 - name: Install dependencies run: | - python -m pip install --upgrade pip setuptools + python -m pip install --upgrade pip pip install --editable ".[dev]" - run: ./gyp -V && ./gyp --version && gyp -V && gyp --version - name: Lint with ruff # See pyproject.toml for settings diff --git a/docs/Hacking.md b/docs/Hacking.md index b00783b..156d485 100644 --- a/docs/Hacking.md +++ b/docs/Hacking.md @@ -24,7 +24,7 @@ to make sure your changes aren't breaking anything important. You run the test driver with e.g. ``` sh -$ python -m pip install --upgrade pip setuptools +$ python -m pip install --upgrade pip $ pip install --editable ".[dev]" $ python -m pytest ``` diff --git a/pylib/gyp/__init__.py b/pylib/gyp/__init__.py index 8933d0c..adea2f0 100755 --- a/pylib/gyp/__init__.py +++ b/pylib/gyp/__init__.py @@ -696,7 +696,7 @@ def main(args): return 1 -# NOTE: setuptools generated console_scripts calls function with no arguments +# NOTE: console_scripts calls this function with no arguments def script_main(): return main(sys.argv[1:])