Merge remote-tracking branch 'upstream/master' into HEAD

Author: rgommers

.pylintrc

@@ -17,6 +17,7 @@ disable=
     cell-var-from-loop,
     consider-using-f-string,
     consider-using-with,
+    contextmanager-generator-missing-cleanup,
     cyclic-import,
     deprecated-decorator,
     duplicate-code,
@@ -47,6 +48,7 @@ disable=
     not-an-iterable,
     not-callable,
     pointless-string-statement,
+    possibly-used-before-assignment,
     protected-access,
     raise-missing-from,
     redeclared-assigned-name,
@@ -75,6 +77,7 @@ disable=
     unsubscriptable-object,
     unused-argument,
     unused-variable,
+    used-before-assignment,
     useless-super-delegation,
     wrong-import-order,
     wrong-import-position,

azure-pipelines.yml

@@ -26,7 +26,7 @@ trigger:
       - 'test cases'
       - 'unittests'
       - 'azure-pipelines.yml'
-      - 'ci/azure-steps.yml'
+      - 'ci/run.ps1'
       - 'run_project_tests.py'
       - 'run_tests.py'
       - 'run_unittests.py'
@@ -41,7 +41,7 @@ pr:
       - 'test cases'
       - 'unittests'
       - 'azure-pipelines.yml'
-      - 'ci/azure-steps.yml'
+      - 'ci/run.ps1'
       - 'run_project_tests.py'
       - 'run_tests.py'
       - 'run_unittests.py'

ci/ciimage/build.py

@@ -80,11 +80,6 @@ def gen_bashrc(self) -> None:
             fi
         '''
 
-        if self.data_dir.name == 'gentoo':
-            out_data += '''
-                source /etc/profile
-            '''
-
         out_file.write_text(out_data, encoding='utf-8')
 
         # make it executable

ci/ciimage/cuda/install.sh

@@ -18,4 +18,4 @@ install_minimal_python_packages
 # Manually remove cache to avoid GitHub space restrictions
 rm -rf /var/cache/pacman
 
-echo "source /etc/profile.d/cuda.sh" >> /ci/env_vars.sh
+echo "source /etc/profile" >> /ci/env_vars.sh

ci/ciimage/gentoo/install.sh

@@ -156,3 +156,5 @@ rm /usr/lib/python/EXTERNALLY-MANAGED
 python3 -m ensurepip
 install_python_packages
 python3 -m pip install "${base_python_pkgs[@]}"
+
+echo "source /etc/profile" >> /ci/env_vars.sh

ci/run.ps1

@@ -8,21 +8,22 @@ if ($LastExitCode -ne 0) {
 $env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey|PostgreSQL' }) -join ';'
 
 if ($env:arch -eq 'x64') {
+    rustup default 1.77
     # Rust puts its shared stdlib in a secret place, but it is needed to run tests.
-    $env:Path += ";$HOME/.rustup/toolchains/stable-x86_64-pc-windows-msvc/bin"
+    $env:Path += ";$HOME/.rustup/toolchains/1.77-x86_64-pc-windows-msvc/bin"
 } elseif ($env:arch -eq 'x86') {
     # Switch to the x86 Rust toolchain
-    rustup default stable-i686-pc-windows-msvc
-
-    # Also install clippy
-    rustup component add clippy
+    rustup default 1.77-i686-pc-windows-msvc
 
     # Rust puts its shared stdlib in a secret place, but it is needed to run tests.
-    $env:Path += ";$HOME/.rustup/toolchains/stable-i686-pc-windows-msvc/bin"
+    $env:Path += ";$HOME/.rustup/toolchains/1.77-i686-pc-windows-msvc/bin"
     # Need 32-bit Python for tests that need the Python dependency
     $env:Path = "C:\hostedtoolcache\windows\Python\3.7.9\x86;C:\hostedtoolcache\windows\Python\3.7.9\x86\Scripts;$env:Path"
 }
 
+# Also install clippy
+rustup component add clippy
+
 # Set the CI env var for the meson test framework
 $env:CI = '1'
 

data/shell-completions/bash/meson

@@ -580,6 +580,7 @@ _meson-test() {
     quiet
     timeout-multiplier
     setup
+    max-lines
     test-args
   )
 

data/shell-completions/zsh/_meson

@@ -196,6 +196,7 @@ local -a meson_commands=(
   '(--quiet -q)'{'--quiet','-q'}'[produce less output to the terminal]'
   '(--timeout-multiplier -t)'{'--timeout-multiplier','-t'}'[a multiplier for test timeouts]:Python floating-point number: '
   '--setup[which test setup to use]:test setup: '
+  '--max-lines[Maximum number of lines to show from a long test log]:Python integer number: '
   '--test-args[arguments to pass to the tests]: : '
   '*:Meson tests:__meson_test_names'
   )

docs/markdown/Builtin-options.md

@@ -408,7 +408,8 @@ interpreter directly, even if it is a venv. Setting to `venv` will instead use
 the paths for the virtualenv the python found installation comes from (or fail
 if it is not a virtualenv).  Setting to `auto` will check if the found
 installation is a virtualenv, and use `venv` or `system` as appropriate (but
-never `prefix`). This option is mutually exclusive with the `platlibdir`/`purelibdir`.
+never `prefix`). Note that Conda environments are treated as `system`.
+This option is mutually exclusive with the `platlibdir`/`purelibdir`.
 
 For backwards compatibility purposes, the default `install_env` is `prefix`.
 

docs/markdown/FAQ.md

@@ -695,3 +695,16 @@ directory. It glob ignores ```"*"```, since all generated files should not be
 checked into git.
 
 Users of older versions of Meson may need to set up ignore files themselves.
+
+## How to add preprocessor defines to a target?
+
+Just add `-DFOO` to `c_args` or `cpp_args`. This works for all known compilers.
+
+```meson
+mylib = library('mylib', 'mysource.c', c_args: ['-DFOO'])
+```
+
+Even though [MSVC documentation](https://learn.microsoft.com/en-us/cpp/build/reference/d-preprocessor-definitions)
+uses `/D` for preprocessor defines, its [command-line syntax](https://learn.microsoft.com/en-us/cpp/build/reference/compiler-command-line-syntax)
+accepts `-` instead of `/`.
+It's not necessary to treat preprocessor defines specially in Meson ([GH-6269](https://github.com/mesonbuild/meson/issues/6269#issuecomment-560003922)).