Merge branch 'main' into engines-and-deps

Author: wraithgar

.github/workflows/tests.yml

@@ -8,6 +8,12 @@ on:
   pull_request:
     branches: [ main ]
 jobs:
+  Lint_Python:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - run: pip install --user ruff
+    - run: ruff --format=github --select="E,F,PLC,PLE,UP,W,YTT" --ignore="PLC1901,S101,UP031" --target-version=py37 .
   Tests:
     strategy:
       fail-fast: false
@@ -33,15 +39,12 @@ jobs:
       - name: Install Dependencies
         run: |
           npm install --no-progress
-          pip install flake8 pytest
+          pip install pytest
       - name: Set Windows environment
         if: startsWith(matrix.os, 'windows')
         run: |
           echo 'GYP_MSVS_VERSION=2015' >> $Env:GITHUB_ENV
           echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
-      - name: Lint Python
-        if: startsWith(matrix.os, 'ubuntu')
-        run: flake8 . --ignore=E203,W503  --max-complexity=101 --max-line-length=88 --show-source --statistics
       - name: Run Python tests
         run: python -m pytest
       # - name: Run doctests with pytest

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+### [9.3.1](https://www.github.com/nodejs/node-gyp/compare/v9.3.0...v9.3.1) (2022-12-16)
+
+
+### Bug Fixes
+
+* increase node 12 support to ^12.13 ([#2771](https://www.github.com/nodejs/node-gyp/issues/2771)) ([888efb9](https://www.github.com/nodejs/node-gyp/commit/888efb9055857afee6a6b54550722cf9ae3ee323))
+
+
+### Miscellaneous
+
+* update python test matrix ([#2774](https://www.github.com/nodejs/node-gyp/issues/2774)) ([38f01fa](https://www.github.com/nodejs/node-gyp/commit/38f01fa57d10fdb3db7697121d957bc2e0e96508))
+
 ## [9.3.0](https://www.github.com/nodejs/node-gyp/compare/v9.2.0...v9.3.0) (2022-10-10)
 
 

README.md

@@ -53,7 +53,6 @@ Install tools and configuration manually:
    * Install Visual C++ Build Environment: [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools)
    (using "Visual C++ build tools" workload) or [Visual Studio Community](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community)
    (using the "Desktop development with C++" workload)
-   * Launch cmd, `npm config set msvs_version 2017`
 
    If the above steps didn't work for you, please visit [Microsoft's Node.js Guidelines for Windows](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules) for additional tips.
 

docs/README.md

@@ -4,7 +4,15 @@ Please look thru your error log for the string `gyp info using node-gyp@` and if
 
 ## `node-sass` is deprecated
 
-Please be aware that the package [`node-sass` is deprecated](https://github.com/sass/node-sass#node-sass) so you should actively seek alternatives.  Please avoid opening new `node-sass` issues on this repo.  You can try `npm install --global node-sass@latest` but we [cannot help much](https://github.com/nodejs/node-gyp/issues?q=is%3Aissue+label%3A%22Node+Sass+--%3E+Dart+Sass%22+) here.
+Please be aware that the package [`node-sass` is deprecated](https://github.com/sass/node-sass#node-sass) so you should actively seek alternatives.  You can try:
+```
+npm uninstall node-sass
+npm install sass --save
+# or ...
+npm install --global node-sass@latest
+```
+`node-sass` projects _may_ work by downgrading to Node.js v14 but [that release is end-of-life](https://github.com/nodejs/release#release-schedule).
+But in any case, please avoid opening new `node-sass` issues on this repo because we [cannot help much](https://github.com/nodejs/node-gyp/issues?q=is%3Aissue+label%3A%22Node+Sass+--%3E+Dart+Sass%22+).
 
 ## Issues finding the installed Visual Studio
 

gyp/pylib/gyp/generator/eclipse.py

@@ -24,7 +24,7 @@
 import gyp.common
 import gyp.msvs_emulation
 import shlex
-import xml.etree.cElementTree as ET
+import xml.etree.ElementTree as ET
 
 generator_wants_static_library_dependencies_adjusted = False
 

gyp/pylib/gyp/xcodeproj_file.py

@@ -2770,7 +2770,7 @@ def __init__(self, properties=None, id=None, parent=None, path=None):
         self.path = path
         self._other_pbxprojects = {}
         # super
-        return XCContainerPortal.__init__(self, properties, id, parent)
+        XCContainerPortal.__init__(self, properties, id, parent)
 
     def Name(self):
         name = self.path

package.json

@@ -11,7 +11,7 @@
     "bindings",
     "gyp"
   ],
-  "version": "9.3.0",
+  "version": "9.3.1",
   "installVersion": 9,
   "author": "Nathan Rajlich <nathan@tootallnate.net> (http://tootallnate.net)",
   "repository": {

update-gyp.py

@@ -49,7 +49,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
                     if not is_within_directory(path, member_path):
                         raise Exception("Attempted Path Traversal in Tar File")
 
-                tar.extractall(path, members, numeric_owner)
+                tar.extractall(path, members, numeric_owner=numeric_owner)
 
             safe_extract(tar_ref, unzip_target)