Fix 4746 tempfile enc issue

.appveyor.yml

@@ -35,40 +35,37 @@ environment:
   SCONS_CACHE_MSVC_CONFIG: "true"
   matrix:
     # Test oldest and newest supported Pythons, and a subset in between.
-    # Skipping 3.7 and 3.9 at this time
-    - WINPYTHON: "Python312"
-
-    - WINPYTHON: "Python310"
-
-    - WINPYTHON: "Python38"
-
-    - WINPYTHON: "Python36"
+    # Skipping 3.8, 3.10, 3.12 at this time
+    - WINPYTHON: "Python313"
+    - WINPYTHON: "Python311"
+    - WINPYTHON: "Python39"
+    - WINPYTHON: "Python37"
 
 # remove sets of build jobs based on criteria below
 # to fine tune the number and platforms tested
 matrix:
   exclude:
-    # test python 3.6 on Visual Studio 2017 image
+    # test python 3.7 on Visual Studio 2017 image
     - image: Visual Studio 2017
-      WINPYTHON: "Python312"
+      WINPYTHON: "Python313"
     - image: Visual Studio 2017
-      WINPYTHON: "Python310"
+      WINPYTHON: "Python311"
     - image: Visual Studio 2017
-      WINPYTHON: "Python38"
+      WINPYTHON: "Python39"
 
-    # test python 3.8 on Visual Studio 2019 image
+    # test python 3.9 on Visual Studio 2019 image
     - image: Visual Studio 2019
-      WINPYTHON: "Python312"
+      WINPYTHON: "Python313"
     - image: Visual Studio 2019
-      WINPYTHON: "Python310"
+      WINPYTHON: "Python311"
     - image: Visual Studio 2019
-      WINPYTHON: "Python36"
+      WINPYTHON: "Python37"
 
-    # test python 3.10 and 3.11 on Visual Studio 2022 image
+    # test python 3.11, 3.13 on Visual Studio 2022 image
     - image: Visual Studio 2022
-      WINPYTHON: "Python36"
+      WINPYTHON: "Python39"
     - image: Visual Studio 2022
-      WINPYTHON: "Python38"
+      WINPYTHON: "Python37"
 
 # Remove some binaries we don't want to be found
 # Note this is no longer needed, git-windows bin/ is quite minimal now.

.editorconfig

@@ -10,17 +10,17 @@ trim_trailing_whitespace = true
 end_of_line = lf
 charset = utf-8
 
-[*.py]
-max_line_length = 78
+[{*.py,SConstruct,SConscript}]
+max_line_length = 88
 ensure_newline_before_comments = true
 include_trailing_comma = true
 use_parentheses = true
 
-[*.xml]
+[*.{xml,yml,yaml}]
 indent_size = 2
 
 [*.rst]
 indent_size = 3
 
-[*.bat]
+[*.{bat,cmd,ps1}]
 end_of_line = crlf

.git-blame-ignore-revs

@@ -1,2 +1,6 @@
 # files reformatted from DOS line-endings
 1277d8e5ab6457ed18d291100539f31d1bdb2d7c
+# enforced .editorconfig eol settings
+fbb026ef1145fe29e0ec3c1b66a3e99cac51e18d
+# Black/Ruff'd test framework code.
+c9d9fa58b796532320a2248ddc5be07b7280adf3

.gitattributes

@@ -1,7 +1,10 @@
+* text=auto eol=lf
+*.bat eol=crlf
+*.cmd eol=crlf
+*.ps1 eol=crlf
+
 doc/* linguist-documentation
 SCons/Tool/docbook/docbook-xsl-1.76.1 linguist-vendored
 *.xml linguist-documentation
 *.xsl linguist-documentation
 *.gen linguist-documentation
-
-*.in eol=lf

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,5 +7,5 @@ https://scons.org/guidelines.html
 ## Contributor Checklist:
 
 * [ ] I have created a new test or updated the unit tests to cover the new/changed functionality.
-* [ ] I have updated `CHANGES.txt` (and read the `README.rst`)
+* [ ] I have updated `CHANGES.txt` and `RELEASE.txt` (and read the `README.rst`).
 * [ ] I have updated the appropriate documentation

.github/workflows/experimental_tests.yml

@@ -13,47 +13,76 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+env:
+    # For use by the Windows runner (ignored by the others):
+    SCONS_CACHE_MSVC_CONFIG: 1
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
+  # This workflow contains a single job called "experimental"
   experimental:
 
     strategy:
       fail-fast: false
       matrix:
-        # note: in the 2nd half of 2022 the setup-mingw was often failing on
-        # windows-latest. revisit someday (perhaps when there's an @v3)
-        #os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-        os: ['ubuntu-latest', 'windows-2019', 'macos-latest']
+        # In the 2nd half of 2022 the setup-mingw was often failing on
+        # windows-latest, when 2022 became the latest. Now 2025 is out,
+        # and 2019 is being retired, we need some kind of a solution.
+        cfg: [
+          {os: 'ubuntu-latest', args: ''},
+          {os: 'windows-latest', args: ''},
+          {os: 'macos-latest', args: '--exclude-list=testing/ci/macos_ci_skip.txt'},
+        ]
 
     # The type of runner that the job will run on
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.cfg.os }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4
 
       # experiment: maybe don't need this?
       # update: looks like we do: with this commented out, the build hung
-      - name: Set up MinGW
-        uses: egor-tensin/setup-mingw@v2.2.0
-        if: matrix.os == 'windows-2019'
+      # - name: Set up MinGW
+      #   uses: egor-tensin/setup-mingw@v2.2.0
+      #   if: matrix.os == 'windows-2019'
+      #   with:
+      #     platform: x64
+      #     static: 0
+
+      - name: Set up MSYS2 ${{ matrix.cfg.os }}
+        uses: msys2/setup-msys2@v2
+        if: startsWith(matrix.cfg.os, 'windows')
         with:
-          platform: x64
-          static: 0
+          msystem: UCRT64
+          update: false
+          install: git mingw-w64-ucrt-x86_64-gcc
 
-      - name: Set up Python 3.11 ${{ matrix.os }}
-        uses: actions/setup-python@v5.1.0
+      - name: Set up Python 3.11 ${{ matrix.cfg.os }}
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
-      - name: Install dependencies including ninja ${{ matrix.os }}
+      - name: Install dependencies including ninja ${{ matrix.cfg.os }}
         run: |
-          python -m pip install --upgrade pip setuptools wheel
-          python -m pip install ninja psutil
+          python -m pip install --progress-bar off --upgrade pip
+          python -m pip install --progress-bar off ninja psutil
           # sudo apt-get update
 
-      - name: Test experimental packages ${{ matrix.os }}
+      - name: Populate MSVC cache ${{ matrix.cfg.os }}
+        if: startsWith(matrix.cfg.os, 'windows')
+        run: |
+          python testing/ci/windows_msvc_cache.py
+
+      - name: Test experimental packages ${{ matrix.cfg.os }}
         run: |
-          python runtest.py test/import.py test/ninja
+          python runtest.py --time ${{ matrix.cfg.args }} test/import.py test/ninja
+
+      - name: Archive Failed tests ${{ matrix.cfg.os }}
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: ${{ matrix.cfg.os }}-failed-tests
+          path: |
+            failed_tests.log

.github/workflows/framework_tests.yml

@@ -29,10 +29,10 @@ jobs:
 
     steps:
       # Checkouut repository under $GITHUB_WORKSPACE
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.11 ${{ matrix.os }}
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 

.github/workflows/runtest-win-msvc.yml

@@ -0,0 +1,62 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Test MSVC Optional Environment
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+    SCONS_CACHE_MSVC_CONFIG: 1
+    SCONS_CACHE_MSVC_FORCE_DEFAULTS: 1
+    POWERSHELL_TELEMETRY_OPTOUT: 1
+    PSDisableModuleAnalysisCacheCleanup: 1
+    VCPKG_DISABLE_METRICS: 1
+    VSCMD_SKIP_SENDTELEMETRY: 1
+
+jobs:
+  runtest-msvc:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['windows-latest']
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python 3.12 ${{ matrix.os }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          cache: 'pip'
+
+      - name: Install Python dependencies ${{ matrix.os }}
+        run: |
+          python -m pip install --progress-bar off --upgrade pip
+          python -m pip install --progress-bar off -r requirements-dev.txt
+
+      - name: runtest ${{ matrix.os }}
+        run: |
+          python runtest.py --file=testing/ci/msvc_ci_run.txt --time
+
+      - name: Display MSVC cache ${{ matrix.os }}
+        if: always()
+        run: |
+          python testing/ci/windows_msvc_cache.py --skip-populate
+
+      - name: Archive Failed tests ${{ matrix.os }}
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: ${{ matrix.os }}-failed-tests
+          path: |
+            failed_tests.log

.github/workflows/runtest-win.yml

@@ -13,29 +13,48 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+env:
+    SCONS_CACHE_MSVC_CONFIG: 1
+
 jobs:
   runtest-win32:
-    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['windows-latest']
+
+    runs-on: ${{ matrix.os }}
+
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4
 
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5.1.0
+      - name: Set up Python 3.12 ${{ matrix.os }}
+        uses: actions/setup-python@v5
         with:
           python-version: '3.12'
+          cache: 'pip'
+
+      - name: Install Python dependencies ${{ matrix.os }}
+        run: |
+          python -m pip install --progress-bar off --upgrade pip
+          python -m pip install --progress-bar off -r requirements-dev.txt
+
+      - name: Install Chocolatey packages ${{ matrix.os }}
+        run: |
+          choco install --yes --no-progress dmd winflexbison3
 
-      - name: Install dependencies including ninja
+      - name: Populate MSVC cache ${{ matrix.os }}
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install -r requirements-dev.txt
+          python testing/ci/windows_msvc_cache.py
 
-      - name: runtest
+      - name: runtest ${{ matrix.os }}
         run: |
-          python runtest.py --all --exclude-list=windows_ci_skip.txt --time --jobs=4
+          python runtest.py --all --exclude-list=testing/ci/windows_ci_skip.txt --time --jobs=4
 
-      - name: Archive Failed tests
-        uses: actions/upload-artifact@v4.3.3
+      - name: Archive Failed tests ${{ matrix.os }}
+        uses: actions/upload-artifact@v4
+        if: failure()
         with:
-          name: windows-failed-tests
+          name: ${{ matrix.os }}-failed-tests
           path: |
             failed_tests.log