Merge bad9b74 into ec7310c

LeonarddeR · web-flow · commit 15fe6b66e2c8 · 2024-07-29T04:21:15.000Z
diff --git a/.coderabbit.yml b/.coderabbit.yml
@@ -26,6 +26,10 @@ reviews:
       This project uses tabs instead of spaces, do not suggest usage of spaces over tabs.
       Are there any 'red flags' in this code that might warrant closer investigation from a security standpoint?
       Explain what makes them suspicious.
+      When providing code suggestions, particularly when requested, ensure GitHub's suggestion format is used, i.e.:
+      ```suggestion
+      <code changes>
+      ```
       "
     - path: "**/*.py"
       instructions: "
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,3 +1,5 @@
+exclude: ^user_docs/(?!en/).*$
+
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -7,8 +9,10 @@ repos:
     - id: check-ast
     - id: check-case-conflict
     - id: check-merge-conflict
-    - id: end-of-file-fixer
     - id: trailing-whitespace
+      types_or: [python, c, c++, batch, markdown]
+    - id: end-of-file-fixer
+      types_or: [python, c, c++, batch, markdown]
 
 - repo: https://github.com/asottile/add-trailing-comma
   rev: v3.1.0
@@ -20,7 +24,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Matches Ruff version in requirements.
-  rev: v0.5.0
+  rev: v0.5.2
   hooks:
     - id: ruff
       name: lint with ruff
@@ -30,21 +34,28 @@ repos:
 
 - repo: local
   hooks:
+    - id: scons-source
+      name: build c/c++ files
+      entry: cmd.exe /c "scons source -j 0"
+      language: system
+      pass_filenames: false
+      types_or: [c, c++]
     - id: checkPot
       name: translation string check
-      entry: cmd.exe /c "scons checkPot -j 4"
+      entry: cmd.exe /c "scons checkPot -j 0"
       language: system
       pass_filenames: false
-      types: [python, pofile]
+      types: [python]
+      files: ^source/.*$
     - id: unitTest
       name: unit tests
       entry: ./rununittests.bat
       language: script
       pass_filenames: false
-      types: [python, c, c++, batch]
+      types_or: [python, c, c++, batch]
     - id: licenseCheck
       name: Check license compatibility of pip dependencies
-      files: requirements.txt
+      files: ^(requirements\.txt|runlicensecheck\.bat)$
       entry: ./runlicensecheck.bat
       language: script
       pass_filenames: false
diff --git a/requirements.txt b/requirements.txt
@@ -38,7 +38,7 @@ sphinx==7.2.6
 sphinx_rtd_theme==1.3.0
 
 # Requirements for automated linting
-ruff==0.4.10
+ruff==0.5.2
 pre-commit==3.7.1
 
 # Runing automated license checks
diff --git a/sconstruct b/sconstruct
@@ -162,11 +162,15 @@ env.Decider("MD5-timestamp")
 # Warn to run the build on multiple threads so it runs faster
 numJobs = env.GetOption("num_jobs")
 numCores = multiprocessing.cpu_count()
+if numJobs == 0:
+	numJobs = numCores
+	env.SetOption('num_jobs', numJobs)
 if numJobs < numCores:
 	print(
 		f"Warning: Building with {numJobs} concurrent job{'s' if numJobs != 1 else ''} "
 		f"while {numCores} CPU threads are available. "
-		f"Running SCONS with the parameter '-j{numCores}' may lead to a faster build."
+		f"Running SCONS with the parameter '-j{numCores}' may lead to a faster build. "
+		"Running SCONS with parameter '-j0' will automatically pick all available cores. "
 	)
 else:
 	print(f"Building with {numJobs} concurrent jobs")
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -29,6 +29,8 @@ Please refer to [the developer guide](https://www.nvaccess.org/files/nvda/docume
 
 * Added a `.editorconfig` file to NVDA's repository in order for several IDEs to pick up basic NVDA code style rules by default. (#16795, @LeonarddeR)
 * It is now possible to redirect objects retrieved from on-screen coordinates, by using the `NVDAObject.objectFromPointRedirect` method. (#16788, @Emil-18)
+* Running SCons with the parameter `-j0` will automatically pick the maximum number of available CPU cores. (#16868, @LeonarddeR)
+* Updated Ruff to version 0.5.2. (#16868, @LeonarddeR)
 
 #### Deprecations
 
diff --git a/venvUtils/ensureVenv.py b/venvUtils/ensureVenv.py
@@ -179,7 +179,7 @@ def ensureVenvAndRequirements():
 			"This means that transitive dependencies can get out of sync "
 			"with those used in automated builds. "
 			"Would you like to continue recreating the environment?",
-			default=True,
+			default=False,
 		):
 			return createVenvAndPopulate()
 		return populate()
