Merge branch 'master' into fix_4282_file_dir_conflict_stacktrace

Author: bdbaddog

.appveyor.yml

@@ -17,81 +17,81 @@ cache:
   - C:\ProgramData\chocolatey\lib -> appveyor.yml
 
 install:
-  # add python and python user-base to path for pip installs
+  # direct choco install supposed to work, but not? still doing in install.bat
+  #- cinst: dmd ldc swig vswhere ixsltproc winflexbison3
   - cmd: .\.appveyor\install.bat
+  - cmd: if %COVERAGE% equ 1 .\.appveyor\install-cov.bat
 
-# build matrix will be number of images multiplied by each '-' below,
-# less any exclusions.
-# split builds into sets of four jobs due to appveyor per-job time limit
-# Leaving the Coverage build on VS2017 for build-time reasons (1hr time limit)
-# Maybe move this one somewhere else in future to restore some flexibility.
+# Build matrix will be number of images multiplied by #entries in matrix:,
+# less any excludes.
+#
+# "Build" is kind of a misnomer - we are actually running the test suite,
+# and this is slow on Windows, so keep the matrix as small as possible.
+# Leaving the Coverage build on VS2017 for build-time reasons (1hr time limit).
+# maybe move coverage to github in future to restore some flexibility?
 environment:
+  # set COVERAGE to 1 for any builder that should run it
+  COVERAGE: 0
+  SCONS_CACHE_MSVC_CONFIG: "true"
   matrix:
-
+    # Test oldest and newest supported Pythons, and a subset in between.
+    # Skipping 3.8, 3.10, 3.12 at this time
+    - WINPYTHON: "Python313"
     - WINPYTHON: "Python311"
-      COVERAGE: 0
-
-    - WINPYTHON: "Python310"
-      COVERAGE: 0
-
-    - WINPYTHON: "Python38"
-      COVERAGE: 0
-          
-    - WINPYTHON: "Python36"
-      COVERAGE: 1
-
-    # skipping 3.7 and 3.9 at this time
+    - 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: "Python311"
+      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: "Python311"
+      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
+# Remove some binaries we don't want to be found
+# Note this is no longer needed, git-windows bin/ is quite minimal now.
 before_build:
     - ps: .\.appveyor\ignore_git_bins.ps1
 
 build: off
 
 build_script:
-
-  # exclude VS 10.0 because it hangs the testing until this is resolved:
-  # https://help.appveyor.com/discussions/problems/19283-visual-studio-2010-trial-license-has-expired
-  - ps: .\.appveyor\disable_msvc_10.ps1
+  # Image version-based excludes:
+  # No excludes at the moment, but the exclude script generates the
+  # (possibly empty) exclude_list.txt which is used in the following step,
+  # so leave the scheme in place in case we need to put back excludes later.
+  - ps: .\.appveyor\exclude_tests.ps1
 
   # setup coverage by creating the coverage config file, and adding coverage
   # to the sitecustomize so that all python processes start with coverage
-  - ps: .\.appveyor\coverage_setup.ps1
+  - ps: if ($env:COVERAGE -eq 1) { .\.appveyor\coverage_setup.ps1 }
 
   # NOTE: running powershell from cmd is intended because
   # it formats the output correctly
   - cmd: powershell -Command "& { if($env:COVERAGE -eq 1) { coverage run -p --rcfile=$($env:COVERAGE_PROCESS_START) runtest.py -j 2 -t --exclude-list exclude_list.txt -a } else { C:\\%WINPYTHON%\\python.exe runtest.py -j 2 -t --exclude-list exclude_list.txt -a }; if($LastExitCode -eq 2 -Or $LastExitCode -eq 0) { $host.SetShouldExit(0 )} else {$host.SetShouldExit(1)}}"
 
 # run coverage even if there was a test failure
 on_finish:
-  - ps: .\.appveyor\coverage_report.ps1
-  # running codecov in powershell causes an error so running in platform
-  # shells
+  - ps: if ($env:COVERAGE -eq 1) { .\.appveyor\coverage_report.ps1 }
+  # running codecov in powershell causes an error so running in cmd
   - cmd: if %COVERAGE% equ 1 codecov -X gcov --file coverage_xml.xml
 

.appveyor/disable_msvc_10.ps1 .appveyor/exclude_tests.ps1.appveyor/disable_msvc_10.ps1 renamed to .appveyor/exclude_tests.ps1

@@ -1,4 +1,7 @@
 New-Item -Name exclude_list.txt -ItemType File;
+
+# exclude VS 10.0 because it hangs the testing until this is resolved:
+# https://help.appveyor.com/discussions/problems/19283-visual-studio-2010-trial-license-has-expired
 $workaround_image = "Visual Studio 2015";
 if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq $workaround_image) {
     Add-Content -Path 'exclude_list.txt' -Value 'test\MSVS\vs-10.0-exec.py';

.appveyor/install-cov.bat

@@ -0,0 +1,2 @@
+for /F "tokens=*" %%g in ('C:\\%WINPYTHON%\\python.exe -c "import sys; print(sys.path[-1])"') do (set PYSITEDIR=%%g)
+C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off coverage codecov

.appveyor/install.bat

@@ -1,12 +1,13 @@
 C:\\%WINPYTHON%\\python.exe --version
 for /F "tokens=*" %%g in ('C:\\%WINPYTHON%\\python.exe -c "import sys; print(sys.path[-1])"') do (set PYSITEDIR=%%g)
 REM use mingw 32 bit until #3291 is resolved
+REM add python and python user-base to path for pip installs
 set PATH=C:\\%WINPYTHON%;C:\\%WINPYTHON%\\Scripts;C:\\ProgramData\\chocolatey\\bin;C:\\MinGW\\bin;C:\\MinGW\\msys\\1.0\\bin;C:\\cygwin\\bin;C:\\msys64\\usr\\bin;C:\\msys64\\mingw64\\bin;%PATH%
 C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off pip setuptools wheel
-C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off coverage codecov
-set STATIC_DEPS=true & C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off lxml
+
+REM requirements-dev.txt will skip installing lxml for windows and py 3.11+, where there's
+REM no current binary wheel
 C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off -r requirements-dev.txt
-REM install 3rd party tools to test with
+
 choco install --allow-empty-checksums dmd ldc swig vswhere xsltproc winflexbison3
-set SCONS_CACHE_MSVC_CONFIG=true
 set

.editorconfig

@@ -0,0 +1,26 @@
+# EditorConfig file for SCons project
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+[{*.py,SConstruct,SConscript}]
+max_line_length = 88
+ensure_newline_before_comments = true
+include_trailing_comma = true
+use_parentheses = true
+
+[*.{xml,yml,yaml}]
+indent_size = 2
+
+[*.rst]
+indent_size = 3
+
+[*.{bat,cmd,ps1}]
+end_of_line = crlf

.flake8

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

.git-blame-ignore-revs

@@ -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

.gitattributes

@@ -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/PULL_REQUEST_TEMPLATE.md

@@ -13,16 +13,21 @@ 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"
-  build:
+  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']
 
     # The type of runner that the job will run on
@@ -31,23 +36,26 @@ jobs:
     # 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@v2
+      - uses: actions/checkout@v4.1.6
 
+      # 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
+        uses: egor-tensin/setup-mingw@v2.2.0
         if: matrix.os == 'windows-2019'
         with:
           platform: x64
+          static: 0
 
       - name: Set up Python 3.11 ${{ matrix.os }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: '3.11'
 
       - name: Install dependencies including ninja ${{ matrix.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 }}