windows CI upgrade

.github/docker/rez-win-base/Dockerfile

@@ -23,13 +23,13 @@ ARG PWSH_VERSION=6.2.2
 # - PowerShellCore
 #
 ENV chocolateyUseWindowsCompression false
-RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'));             `
-    choco feature disable --name showDownloadProgress;                                                 `
-    choco install git.install --yes --version=${ENV:GIT_VERSION};                                      `
+RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); `
+    choco feature disable --name showDownloadProgress; `
+    choco install git.install --yes --version=${ENV:GIT_VERSION}; `
     choco install cmake --yes --version=${ENV:CMAKE_VERSION} --installargs 'ADD_CMAKE_TO_PATH=System'; `
-    choco install pwsh --yes --version=${PWSH_VERSION};                                                `
-    choco install --yes choco-cleaner;                                                                 `
-    C:\ProgramData\chocolatey\bin\choco-cleaner.ps1;                                                   `
+    choco install pwsh --yes --version=${PWSH_VERSION}; `
+    choco install --yes choco-cleaner; `
+    C:\ProgramData\chocolatey\bin\choco-cleaner.bat; `
     choco uninstall --yes choco-cleaner
 
 ENTRYPOINT ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "ByPass"]

.github/docker/rez-win-py/Dockerfile

@@ -6,6 +6,10 @@ ARG BASE_TAG
 # Base image windows version
 FROM rez-win-base:$BASE_TAG
 
+# Tag applied to this image
+ARG PY_TAG
+ENV _PY_TAG=$PY_TAG
+
 # NOTE: Any " requires \" in the Dockerfile for windows.
 # NOTE: The order matters. ARG after the shell command will allow access via
 # the PowerShell environment like ${ENV:PYTHON_VERSION}.
@@ -23,27 +27,27 @@ ARG PYTHON_VERSION
 # Python 2.x uses msi while 3.x has an exe with separate arguments
 # Verifies the installation by running python explicitly and via `python`
 #
-RUN ${PYTHON_INSTALL_PATH} = 'C:\Python';                                                                                            `
-    ${PYTHON_MAJOR_VERSION} = ${ENV:PYTHON_VERSION}.Split('.')[0];                                                                   `
-    if (${PYTHON_MAJOR_VERSION} -eq "2") {                                                                                           `
-        ${INSTALLARGS} = \"'/qn /norestart ADDLOCAL=ALL ALLUSERS=1 TARGETDIR=`\"\" + ${PYTHON_INSTALL_PATH} + \"`\"'\";              `
-    } else {                                                                                                                         `
-        ${INSTALLARGS} = \"'/quiet InstallAllUsers=1 PrependPath=1 TargetDir=`\"\" + ${PYTHON_INSTALL_PATH} + \"`\"'\";              `
-    }                                                                                                                                `
-    choco install python${PYTHON_MAJOR_VERSION} --yes --version=\"${ENV:PYTHON_VERSION}\" --override --installargs=${INSTALLARGS};   `
+RUN ${PYTHON_INSTALL_PATH} = 'C:\Python'; `
+    ${PYTHON_MAJOR_VERSION} = ${ENV:PYTHON_VERSION}.Split('.')[0]; `
+    if (${PYTHON_MAJOR_VERSION} -eq "2") { `
+        ${INSTALLARGS} = \"'/qn /norestart ADDLOCAL=ALL ALLUSERS=1 TARGETDIR=`\"\" + ${PYTHON_INSTALL_PATH} + \"`\"'\"; `
+    } else { `
+        ${INSTALLARGS} = \"'/quiet InstallAllUsers=1 PrependPath=1 TargetDir=`\"\" + ${PYTHON_INSTALL_PATH} + \"`\"'\"; `
+    } `
+    choco install python${PYTHON_MAJOR_VERSION} --yes --version=\"${ENV:PYTHON_VERSION}\" --override --installargs=${INSTALLARGS}; `
     if (-not $?) {exit 1};
 
 # ------------------------------------------------------------------------------------------------------------
 # Verify Python
 #
-RUN $python_relative_ver = (& python --version 2>&1).ToString().Trim().Split(" ")[1];                                       `
-    $python_explicit_ver = (& C:\python\python.exe --version 2>&1).ToString().Trim().Split(" ")[1];                         `
-    if (-not $?) {exit 1};                                                                                                  `
-    $python_relative_ver = (& python --version 2>&1).ToString().Trim().Split(" ")[1];                                       `
-    $python_explicit_ver = (& C:\python\python.exe --version 2>&1).ToString().Trim().Split(" ")[1];                         `
+RUN $python_relative_ver = (& python --version 2>&1).ToString().Trim().Split(" ")[1]; `
+    $python_explicit_ver = (& C:\python\python.exe --version 2>&1).ToString().Trim().Split(" ")[1]; `
+    if (-not $?) {exit 1}; `
+    $python_relative_ver = (& python --version 2>&1).ToString().Trim().Split(" ")[1]; `
+    $python_explicit_ver = (& C:\python\python.exe --version 2>&1).ToString().Trim().Split(" ")[1]; `
     if (-not ($python_explicit_ver -eq $python_relative_ver -and $python_explicit_ver -eq ${ENV:PYTHON_VERSION})) {exit 1}; `
-    choco install --yes choco-cleaner;                                                                                      `
-    C:\ProgramData\chocolatey\bin\choco-cleaner.ps1;                                                                        `
+    choco install --yes choco-cleaner; `
+    C:\ProgramData\chocolatey\bin\choco-cleaner.bat; `
     choco uninstall --yes choco-cleaner
 
 COPY entrypoint.ps1 /entrypoint.ps1

.github/docker/rez-win-py/entrypoint.ps1

@@ -10,6 +10,12 @@ $ErrorActionPreference = "Stop"
 #
 ${ENV:PYTHONIOENCODING} = "UTF-8"
 
+# Print name of image being run, for debugging purposes. We can't show the
+# literal image name here, because it just uses 'latest' tagged image (see
+# explanation in windows-docker-image.yaml - on.push)
+#
+Write-Output "Using docker image rez-win-py:${ENV:_PY_TAG}"
+
 # Verify Python
 #
 python --version
@@ -34,6 +40,9 @@ mkdir build
 python .\checkout\install.py build
 if (-not $?) {exit 1}
 
+# Install pytest for better rez-selftest output
+.\build\Scripts\rez\rez-python -m pip install pytest-cov
+
 # Run Rez Tests
 #
 .\build\Scripts\rez\rez-selftest.exe

.github/workflows/core.yaml

@@ -6,21 +6,17 @@
 name: core
 on:
   pull_request:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - '**.md'
+    paths:
+      - 'src/**'
+      - '.github/workflows/core.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!**.md'
   push:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - '**.md'
+    paths:
+      - 'src/**'
+      - '.github/workflows/core.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!**.md'
 
 jobs:
   main:

.github/workflows/flake8.yaml

@@ -1,23 +1,23 @@
 name: flake8
 on:
   pull_request:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - 'data/**'
-      - '**.md'
+    paths:
+      - 'src/rez/**.py'
+      - 'src/rezplugins/**.py'
+      - '.github/workflows/flake8.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!src/rez/data/**'
+      - '!src/rez/vendor/**'
+      - '!src/rez/backport/**'
   push:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - 'data/**'
-      - '**.md'
+    paths:
+      - 'src/rez/**.py'
+      - 'src/rezplugins/**.py'
+      - '.github/workflows/flake8.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!src/rez/data/**'
+      - '!src/rez/vendor/**'
+      - '!src/rez/backport/**'
 
 jobs:
   lint:
@@ -40,11 +40,11 @@ jobs:
       - name: Run flake8
         run: >-
           find -name '*.py'
-          -not -path './build_utils/*'
           -not -path './rez/vendor/*'
           -not -path './rez/data/*'
-          -not -path './support/*'
           -not -path './rez/backport/*'
+          -not -path './build_utils/*'
+          -not -path './support/*'
           -not -path './rezgui/*'
           | xargs flake8
         working-directory: src

.github/workflows/installation.yaml

@@ -1,11 +1,11 @@
 name: installation
 on:
   push:
-    paths-ignore:
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - '**.md'
+    paths:
+      - 'src/**'
+      - '.github/workflows/installation.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!**.md'
 
 jobs:
   main:

.github/workflows/mac.yaml

@@ -1,21 +1,17 @@
 name: mac
 on:
   pull_request:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - '**.md'
+    paths:
+      - 'src/**'
+      - '.github/workflows/mac.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!**.md'
   push:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - '**.md'
+    paths:
+      - 'src/**'
+      - '.github/workflows/mac.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!**.md'
 
 jobs:
   main:

.github/workflows/ubuntu.yaml

@@ -1,21 +1,17 @@
 name: ubuntu
 on:
   pull_request:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - '**.md'
+    paths:
+      - 'src/**'
+      - '.github/workflows/ubuntu.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!**.md'
   push:
-    paths-ignore:
-      - '.github/docker/**'
-      - '.github/workflows/windows-docker-image.yaml'
-      - 'src/rez/utils/_version.py'
-      - 'wiki/**'
-      - 'metrics/**'
-      - '**.md'
+    paths:
+      - 'src/**'
+      - '.github/workflows/ubuntu.yaml'
+      - '!src/rez/utils/_version.py'
+      - '!**.md'
 
 jobs:
   main: