feat: update gyp-next to v0.20.0 (#3149)

Author: nodejs-github-bot

gyp/.github/workflows/node-gyp.yml

@@ -10,8 +10,15 @@ jobs:
       fail-fast: false
       matrix:
         node-version: ["22"]
-        os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.10", "3.12", "3.13"]
+        os: [macos-latest, ubuntu-latest, windows-latest]
+        python-version: ["3.9", "3.11", "3.13"]
+        include:
+          - node-version: "22"
+            os: macos-13
+            python-version: "3.13"
+          - node-version: "22"
+            os: windows-2025
+            python-version: "3.13"
     runs-on: ${{ matrix.os }}
     steps:
       - name: Clone gyp-next
@@ -33,7 +40,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
@@ -47,7 +54,6 @@ jobs:
           cp -r gyp-next node-gyp/gyp
       - name: Run tests (macOS or Linux)
         if: runner.os != 'Windows'
-        shell: bash
         run: |
           cd node-gyp
           npm test --python="${pythonLocation}/python"

gyp/.github/workflows/nodejs.yml

@@ -9,8 +9,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
-        python: ["3.8", "3.10", "3.12", "3.13"]
+        os: [macos-latest, ubuntu-latest, windows-latest]
+        python: ["3.9", "3.11", "3.13"]
+        include:
+          - os: macos-13
+            python-version: "3.13"
+          - os: windows-2025
+            python-version: "3.13"
 
     runs-on: ${{ matrix.os }}
     steps:

gyp/.github/workflows/python_tests.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        os: [macos-13, macos-14, ubuntu-latest] # , windows-latest]
+        os: [macos-13, macos-latest, ubuntu-latest] # , windows-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
@@ -23,14 +23,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - uses: seanmiddleditch/gha-setup-ninja@v5
+      - uses: seanmiddleditch/gha-setup-ninja@v6
       - 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
-        run: ruff check --output-format=github .
+        uses: astral-sh/ruff-action@v3
       - name: Test with pytest  # See pyproject.toml for settings
         run: pytest
       # - name: Run doctests with pytest

gyp/.github/workflows/release-please.yml

@@ -25,15 +25,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.12"
-    - name: Install pypa/build
-      run: >-
-        python3 -m pip install build --user
     - name: Build a binary wheel and a source tarball
-      run: python3 -m build
+      run: pipx run build
     - name: Store the distribution packages
       uses: actions/upload-artifact@v4
       with:

gyp/.gitignore

@@ -141,3 +141,6 @@ cython_debug/
 # static files generated from Django application using `collectstatic`
 media
 static
+
+test/fixtures/out
+*.actual

gyp/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "0.19.1"
+    ".": "0.20.0"
 }

gyp/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.20.0](https://github.com/nodejs/gyp-next/compare/v0.19.1...v0.20.0) (2025-03-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* resolve issue with relative paths during linking ([#284](https://github.com/nodejs/gyp-next/issues/284))
+
+### Bug Fixes
+
+* python lint  more ruff rules ([#291](https://github.com/nodejs/gyp-next/issues/291)) ([fabc78c](https://github.com/nodejs/gyp-next/commit/fabc78caffcf988365d970ced5a151f40525077e))
+* remove explicit installation of setuptools ([#278](https://github.com/nodejs/gyp-next/issues/278)) ([e476778](https://github.com/nodejs/gyp-next/commit/e4767782c70ca8427184694589d9f0ded5eeed22))
+* resolve issue with relative paths during linking ([#284](https://github.com/nodejs/gyp-next/issues/284)) ([a2d7439](https://github.com/nodejs/gyp-next/commit/a2d7439fbd3c03f01e1149fdbe682f754bc6cc7f))
+
 ## [0.19.1](https://github.com/nodejs/gyp-next/compare/v0.19.0...v0.19.1) (2024-12-09)
 
 

gyp/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
 ```

gyp/docs/InputFormatReference.md

@@ -194,6 +194,7 @@ lists associated with the following keys, are treated as pathnames:
   * include\_dirs
   * inputs
   * libraries
+  * library\_dirs
   * outputs
   * sources
   * mac\_bundle\_resources
@@ -231,7 +232,8 @@ Source dictionary from `../build/common.gypi`:
 ```
 {
   'include_dirs': ['include'],  # Treated as relative to ../build
-  'libraries': ['-lz'],  # Not treated as a pathname, begins with a dash
+  'library_dirs': ['lib'],      # Treated as relative to ../build
+  'libraries': ['-lz'],   # Not treated as a pathname, begins with a dash
   'defines': ['NDEBUG'],  # defines does not contain pathnames
 }
 ```
@@ -250,6 +252,7 @@ Merged dictionary:
 {
   'sources': ['string_util.cc'],
   'include_dirs': ['../build/include'],
+  'library_dirs': ['../build/lib'],
   'libraries': ['-lz'],
   'defines': ['NDEBUG'],
 }

gyp/gyp_main.py

@@ -5,8 +5,8 @@
 # found in the LICENSE file.
 
 import os
-import sys
 import subprocess
+import sys
 
 
 def IsCygwin():

gyp/pylib/gyp/MSVSProject.py

@@ -4,7 +4,7 @@
 
 """Visual Studio project reader/writer."""
 
-import gyp.easy_xml as easy_xml
+from gyp import easy_xml
 
 # ------------------------------------------------------------------------------
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -7,10 +7,10 @@
 """Unit tests for the MSVSSettings.py file."""
 
 import unittest
-import gyp.MSVSSettings as MSVSSettings
-
 from io import StringIO
 
+from gyp import MSVSSettings
+
 
 class TestSequenceFunctions(unittest.TestCase):
     def setUp(self):

gyp/pylib/gyp/MSVSToolFile.py

@@ -4,7 +4,7 @@
 
 """Visual Studio project reader/writer."""
 
-import gyp.easy_xml as easy_xml
+from gyp import easy_xml
 
 
 class Writer:

gyp/pylib/gyp/MSVSUserFile.py

@@ -8,8 +8,7 @@
 import re
 import socket  # for gethostname
 
-import gyp.easy_xml as easy_xml
-
+from gyp import easy_xml
 
 # ------------------------------------------------------------------------------
 

gyp/pylib/gyp/MSVSUtil.py

@@ -7,7 +7,6 @@
 import copy
 import os
 
-
 # A dictionary mapping supported target types to extensions.
 TARGET_TYPE_EXT = {
     "executable": "exe",

gyp/pylib/gyp/MSVSVersion.py

@@ -5,11 +5,11 @@
 """Handle version information related to Visual Stuio."""
 
 import errno
+import glob
 import os
 import re
 import subprocess
 import sys
-import glob
 
 
 def JoinPath(*args):

gyp/pylib/gyp/__init__.py

@@ -5,16 +5,17 @@
 # found in the LICENSE file.
 
 from __future__ import annotations
-import copy
-import gyp.input
+
 import argparse
+import copy
 import os.path
 import re
 import shlex
 import sys
 import traceback
-from gyp.common import GypError
 
+import gyp.input
+from gyp.common import GypError
 
 # Default debug modes for GYP
 debug = {}
@@ -205,8 +206,7 @@ def NameValueListToDict(name_value_list):
 
 
 def ShlexEnv(env_name):
-    flags = os.environ.get(env_name, [])
-    if flags:
+    if flags := os.environ.get(env_name) or []:
         flags = shlex.split(flags)
     return flags
 
@@ -361,7 +361,7 @@ def gyp_main(args):
         action="store",
         env_name="GYP_CONFIG_DIR",
         default=None,
-        help="The location for configuration files like " "include.gypi.",
+        help="The location for configuration files like include.gypi.",
     )
     parser.add_argument(
         "-d",
@@ -525,19 +525,18 @@ def gyp_main(args):
         # If no format was given on the command line, then check the env variable.
         generate_formats = []
         if options.use_environment:
-            generate_formats = os.environ.get("GYP_GENERATORS", [])
+            generate_formats = os.environ.get("GYP_GENERATORS") or []
         if generate_formats:
             generate_formats = re.split(r"[\s,]", generate_formats)
         if generate_formats:
             options.formats = generate_formats
+        # Nothing in the variable, default based on platform.
+        elif sys.platform == "darwin":
+            options.formats = ["xcode"]
+        elif sys.platform in ("win32", "cygwin"):
+            options.formats = ["msvs"]
         else:
-            # Nothing in the variable, default based on platform.
-            if sys.platform == "darwin":
-                options.formats = ["xcode"]
-            elif sys.platform in ("win32", "cygwin"):
-                options.formats = ["msvs"]
-            else:
-                options.formats = ["make"]
+            options.formats = ["make"]
 
     if not options.generator_output and options.use_environment:
         g_o = os.environ.get("GYP_GENERATOR_OUTPUT")
@@ -696,7 +695,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:])
 

gyp/pylib/gyp/common.py

@@ -6,11 +6,10 @@
 import filecmp
 import os.path
 import re
-import tempfile
-import sys
-import subprocess
 import shlex
-
+import subprocess
+import sys
+import tempfile
 from collections.abc import MutableSet
 
 
@@ -35,7 +34,6 @@ class GypError(Exception):
   to the user.  The main entry point will catch and display this.
   """
 
-    pass
 
 
 def ExceptionAppend(e, msg):