From dab0334caf8c5c1e9a2fda56b9f930c31f36ed86 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Sat, 23 May 2026 12:19:33 -0500 Subject: [PATCH 1/3] Add `prek.toml` for pre-commit hook support --- .github/workflows/runtest.yml | 11 +++++++++++ CHANGES.txt | 2 ++ README.rst | 3 +++ RELEASE.txt | 4 ++++ prek.toml | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 prek.toml diff --git a/.github/workflows/runtest.yml b/.github/workflows/runtest.yml index 6ac21dd91..09cc60f9d 100644 --- a/.github/workflows/runtest.yml +++ b/.github/workflows/runtest.yml @@ -11,6 +11,17 @@ defaults: shell: bash jobs: + prek: + timeout-minutes: 10 + runs-on: ubuntu-slim + + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Style checks via prek + uses: j178/prek-action@v3.0.0 + runtest: strategy: fail-fast: false diff --git a/CHANGES.txt b/CHANGES.txt index 84ab77581..9e8b3a83b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -42,6 +42,8 @@ RELEASE 4.11.0 - Mon, 10 Aug 2026 21:16:00 -0700 existing test environments into a single package. Adjusted AppVeyor to only run for targets unsupported by GitHub runners. - Split `SCons.Util.UtilTests.py` to individual packages where appropriate. + - Added `prek.toml` to support pre-commit hooks. + - Added prek job to `runtest.yml`, ensuring pre-commit hooks are enforced. From William Deegan: - Fix SCons Docbook schema to work with lxml > 5 diff --git a/README.rst b/README.rst index cc5cfd89c..cf4e3070d 100755 --- a/README.rst +++ b/README.rst @@ -25,6 +25,9 @@ SCons - a Software Construction Tool :target: https://github.com/SCons/scons/actions?query=workflow%3A%22SCons+Build%22 :alt: Github Actions +.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/j178/prek/master/docs/assets/badge-v0.json + :target: https://github.com/j178/prek + :alt: prek What is SCons? ============== diff --git a/RELEASE.txt b/RELEASE.txt index 86dbb9d3b..1985be4c5 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -65,6 +65,10 @@ DEVELOPMENT - List visible changes in the way SCons is developed +- Added `prek.toml` to support pre-commit hooks. + +- Added prek job to `runtest.yml`, ensuring pre-commit hooks are enforced. + Thanks to the following contributors listed below for their contributions to this release. ========================================================================================== .. code-block:: text diff --git a/prek.toml b/prek.toml new file mode 100644 index 000000000..1fe49a53d --- /dev/null +++ b/prek.toml @@ -0,0 +1,33 @@ +# Configuration file for `prek`, a git hook framework written in Rust. +# See https://prek.j178.dev for more information. +#:schema https://www.schemastore.org/prek.json + +exclude.glob = [ + "**.in", + "doc/**", + "packaging/**", + "SCons/Tool/docbook/docbook-xsl-1.76.1/**", + "test/CC/gcc-non-utf8-fixture/data", + "test/Interactive/**", +] + +[[repos]] +repo = "builtin" +hooks = [ + { id = "check-added-large-files" }, + { id = "fix-byte-order-marker" }, + { id = "trailing-whitespace" }, + { id = "end-of-file-fixer" }, + { + id = "mixed-line-ending", + name = "fix line endings", + args = ["--fix=lf"], + exclude = '\.(bat|cmd|ps1)$' + }, + { + id = "mixed-line-ending", + name = "fix line endings (crlf)", + args = ["--fix=crlf"], + files = '\.(bat|cmd|ps1)$' + }, +] From 94148bdd757c476efc0a66c43379ee194e107837 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Sat, 23 May 2026 12:30:31 -0500 Subject: [PATCH 2/3] Apply prek changes --- .appveyor.yml | 1 - .appveyor/install.ps1 | 2 +- .codecov.yml | 4 +- .github/FUNDING.yml | 1 - .travis/verify_packages.sh | 2 +- NEWS.d/changes/4306.bugfix | 1 - README-SF.rst | 1 - README-package.rst | 1 - SCons/Node/FS.py | 1 - SCons/Tool/GettextCommon.py | 1 - SCons/Tool/MSCommon/MSVC/Config.py | 1 - SCons/Tool/MSCommon/MSVC/Exceptions.py | 1 - SCons/Tool/MSCommon/MSVC/Policy.py | 1 - SCons/Tool/MSCommon/MSVC/PolicyTests.py | 1 - SCons/Tool/MSCommon/MSVC/Registry.py | 1 - SCons/Tool/MSCommon/MSVC/RegistryTests.py | 1 - SCons/Tool/MSCommon/MSVC/ScriptArguments.py | 1 - .../MSCommon/MSVC/ScriptArgumentsTests.py | 1 - SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py | 1 - SCons/Tool/MSCommon/MSVC/Util.py | 1 - SCons/Tool/MSCommon/MSVC/UtilTests.py | 1 - SCons/Tool/MSCommon/MSVC/Warnings.py | 1 - SCons/Tool/MSCommon/MSVC/WinSDK.py | 1 - SCons/Tool/MSCommon/MSVC/WinSDKTests.py | 1 - SCons/Tool/MSCommon/MSVC/__init__.py | 1 - SCons/Tool/MSCommon/README.rst | 1 - SCons/Tool/MSCommon/vc.py | 1 - SCons/Tool/clangCommon/__init__.py | 2 +- SCons/Tool/docbook/docs/html.xsl | 1 - SCons/Tool/docbook/docs/pdf.xsl | 1 - SCons/Tool/javacTests.py | 2 +- SCons/Tool/linkCommon/README.md | 7 ++- SCons/__init__.py | 2 +- bench/time_member.py | 1 - bin/check_new_contributors.py | 22 ++++----- bin/scp-sourceforge | 2 +- bin/xml_export | 2 +- bin/xml_export-README | 2 - lgtm.yml | 16 +++---- runtest.py | 48 +++++++++---------- src/README.txt | 2 +- .../double_cachedir_fixture/SConstruct | 1 - .../fixture/checklib_extra/SConstruct | 1 - .../fixture/checklib_extra/libA/SConstruct | 1 - test/Configure/is_conftest/fixture/SConstruct | 2 - .../Project/test/test1/stuff.cpp | 2 +- .../Project/test/test1/stuff.cpp | 2 +- test/D/Issues/2994/Project/main.d | 5 +- test/D/di/Image/SConstruct_template | 2 +- test/Decider/MD5-winonly-fixture/test_lex.l | 1 - .../basedir/htmlchunked/image/SConstruct | 1 - .../basedir/htmlchunked/image/manual.xml | 2 +- .../Docbook/basedir/htmlhelp/image/SConstruct | 1 - .../Docbook/basedir/htmlhelp/image/manual.xml | 2 +- .../basedir/slideshtml/image/.exclude_tests | 2 +- .../basedir/slideshtml/image/SConstruct | 3 +- .../Docbook/basedir/slideshtml/image/virt.xml | 1 - .../basedir/slideshtml/image/virtns.xml | 1 - test/Docbook/basic/epub/image/manual.xml | 2 +- test/Docbook/basic/html/image/SConstruct | 1 - test/Docbook/basic/html/image/manual.xml | 2 +- .../basic/htmlchunked/image/SConstruct | 1 - .../basic/htmlchunked/image/manual.xml | 2 +- test/Docbook/basic/htmlhelp/image/SConstruct | 1 - test/Docbook/basic/htmlhelp/image/manual.xml | 2 +- test/Docbook/basic/man/image/SConstruct | 1 - test/Docbook/basic/pdf/image/SConstruct | 1 - test/Docbook/basic/pdf/image/manual.xml | 2 +- .../basic/slideshtml/image/.exclude_tests | 2 +- test/Docbook/basic/slideshtml/image/virt.xml | 1 - .../Docbook/basic/slideshtml/image/virtns.xml | 1 - test/Docbook/basic/slidespdf/image/SConstruct | 1 - test/Docbook/basic/slidespdf/image/virt.xml | 1 - test/Docbook/basic/xinclude/image/SConstruct | 1 - test/Docbook/basic/xslt/image/in.xml | 1 - test/Docbook/basic/xslt/image/to_docbook.xslt | 16 +++---- .../basic/xsltsubdir/image/subdir/in.xml | 1 - .../xsltsubdir/image/subdir/to_docbook.xslt | 16 +++---- .../dependencies/xinclude/image/SConstruct | 1 - .../rootname/htmlchunked/image/SConstruct | 1 - .../rootname/htmlchunked/image/manual.xml | 2 +- .../rootname/htmlhelp/image/SConstruct | 1 - .../rootname/htmlhelp/image/manual.xml | 2 +- .../rootname/slideshtml/image/.exclude_tests | 2 +- .../rootname/slideshtml/image/SConstruct | 3 +- .../rootname/slideshtml/image/virt.xml | 1 - .../rootname/slideshtml/image/virtns.xml | 1 - test/Fortran/fixture/gfortran_shared.f | 2 +- .../lex_headerfile/spaced path/src/lexer.l | 2 +- .../lex_headerfile/spaced path/src/lexer2.l | 2 +- test/MSVC/msvc_fixture/test.cpp | 4 +- test/Parallel/failed-build/fixture/mycopy.py | 2 +- test/Parallel/failed-build/fixture/myfail.py | 2 +- test/Progress/multi_target_fixture/SConstruct | 1 - test/Removed/README.md | 1 - test/SideEffect/Issues/3013/files/SConscript | 1 - test/SideEffect/Issues/3013/files/test.cpp | 1 - test/TEX/biber_biblatex2.py | 2 +- test/TEX/biblatex_plain.py | 1 - .../bug_2811/fixture_dir/SConstruct | 2 +- test/TaskMaster/bug_2811/fixture_dir/a | 2 +- test/fixture/SConstruct_HELP_AddOption.py | 1 - .../no_msvc/no_msvcs_sconstruct_tools.py | 1 - test/implicit-cache/RemoveImplicitDep.py | 2 +- .../ninja_test_sconscripts/ninja_conftest | 2 +- .../sconstruct_mingw_depfile_format | 1 - .../sconstruct_ninja_command_line | 2 +- test/option/debug-action-timestamps.py | 4 +- test/textfile/issue-3550.py | 2 +- test/textfile/textfile.py | 2 +- testing/buildbot.hosts | 2 +- testing/docker/docker.rst | 3 +- testing/docker/fedora32/build/Dockerfile | 1 - testing/docker/fedora32/build/build_image.sh | 1 - .../docker/fedora32/build/docker-compose.yml | 1 - testing/docker/fedora32/build/readme.rst | 3 +- .../fedora32/build/start_build_shell.sh | 1 - .../fedora32/build/startup/setup_container.sh | 1 - .../docker/fedora32/build/stop_build_shell.sh | 1 - testing/docker/fedora32/test/Dockerfile | 1 - testing/docker/fedora32/test/build_image.sh | 1 - .../docker/fedora32/test/docker-compose.yml | 1 - testing/docker/fedora32/test/readme.rst | 3 +- .../docker/fedora32/test/start_test_shell.sh | 1 - .../fedora32/test/startup/setup_container.sh | 1 - .../docker/fedora32/test/stop_test_shell.sh | 1 - .../docker/ubuntu19.10/build/build_image.sh | 1 - .../ubuntu19.10/build/docker-compose.yml | 1 - testing/docker/ubuntu19.10/build/readme.rst | 3 +- .../ubuntu19.10/build/start_build_shell.sh | 1 - .../build/startup/setup_container.sh | 1 - .../ubuntu19.10/build/stop_build_shell.sh | 1 - testing/docker/ubuntu19.10/test/Dockerfile | 1 - .../docker/ubuntu19.10/test/build_image.sh | 1 - .../ubuntu19.10/test/docker-compose.yml | 1 - testing/docker/ubuntu19.10/test/readme.rst | 3 +- .../ubuntu19.10/test/start_test_shell.sh | 1 - .../test/startup/setup_container.sh | 1 - .../ubuntu19.10/test/stop_test_shell.sh | 1 - testing/framework/README.txt | 2 - testing/framework/test-framework.rst | 1 - timings/ElectricCloud/genscons.pl | 8 ++-- timings/changelog.html | 3 +- timings/graph.html | 6 +-- timings/js/coordinates.js | 6 +-- 145 files changed, 125 insertions(+), 225 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8e9324aef..4ac99e431 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -64,4 +64,3 @@ on_finish: - ps: .\.appveyor\coverage_report.ps1 # running codecov in powershell causes an error so running in cmd - cmd: .appveyor\codecov_upload.bat - diff --git a/.appveyor/install.ps1 b/.appveyor/install.ps1 index edcadd195..4079fbea3 100644 --- a/.appveyor/install.ps1 +++ b/.appveyor/install.ps1 @@ -46,7 +46,7 @@ $toolPaths = @( ) $env:PATH = ($pythonPaths + $toolPaths + @($env:PATH)) -join ';' -# Ensure we have the correct path to the python executable, +# Ensure we have the correct path to the python executable, # explicitly avoiding MSYS/Cygwin versions. $pythonExe = $null diff --git a/.codecov.yml b/.codecov.yml index 512670b53..a5e3eb60f 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -29,7 +29,7 @@ coverage: status: project: default: - # compare against the current coverage + # compare against the current coverage # that PR is attempt to merge to # don't consider a drop in coverage success target: auto @@ -38,7 +38,7 @@ coverage: patch: default: - # considering only the lines changed + # considering only the lines changed # make sure all new lines in the PR are covered # to consider a success target: 100 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 486f1709e..8c9b8e344 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -2,4 +2,3 @@ github: [bdbaddog, mwichmann] patreon: bdbaddog - diff --git a/.travis/verify_packages.sh b/.travis/verify_packages.sh index de64a4f89..f0da4613a 100755 --- a/.travis/verify_packages.sh +++ b/.travis/verify_packages.sh @@ -29,4 +29,4 @@ if [[ $zip_man_files != $expected_man_file_count ]]; then retval=3 fi -exit $retval \ No newline at end of file +exit $retval diff --git a/NEWS.d/changes/4306.bugfix b/NEWS.d/changes/4306.bugfix index 7ec2774ff..b60f76165 100644 --- a/NEWS.d/changes/4306.bugfix +++ b/NEWS.d/changes/4306.bugfix @@ -2,4 +2,3 @@ When debugging (--debug=pdb), the filenames SConstruct and SConscript are now recognized when manipulating breakpoints. Previously, only a full pathname worked, as otherwise pdb required a .py extension on files. - diff --git a/README-SF.rst b/README-SF.rst index 5e4e1066b..e57cc6a33 100755 --- a/README-SF.rst +++ b/README-SF.rst @@ -613,4 +613,3 @@ many contributors, including but not at all limited to: \... and many others. Copyright (c) 2001 - 2026 The SCons Foundation - diff --git a/README-package.rst b/README-package.rst index b8b2d6d81..439e52198 100755 --- a/README-package.rst +++ b/README-package.rst @@ -196,4 +196,3 @@ Check the SCons web site at https://scons.org Copyright (c) 2001 - 2026 The SCons Foundation - diff --git a/SCons/Node/FS.py b/SCons/Node/FS.py index 4420a83c3..fdace74c7 100644 --- a/SCons/Node/FS.py +++ b/SCons/Node/FS.py @@ -3878,4 +3878,3 @@ def invalidate_node_memos(targets: str | Node | list[str | Node]) -> None: EntryNode = Entry DirNode = Dir FileNode = File - diff --git a/SCons/Tool/GettextCommon.py b/SCons/Tool/GettextCommon.py index d24489e9c..3501161fe 100644 --- a/SCons/Tool/GettextCommon.py +++ b/SCons/Tool/GettextCommon.py @@ -428,4 +428,3 @@ def _msgfmt_exists(env): def tool_list(platform, env): """ List tools that shall be generated by top-level `gettext` tool """ return ['xgettext', 'msginit', 'msgmerge', 'msgfmt'] - diff --git a/SCons/Tool/MSCommon/MSVC/Config.py b/SCons/Tool/MSCommon/MSVC/Config.py index 16c6b1487..c80cfe5ab 100644 --- a/SCons/Tool/MSCommon/MSVC/Config.py +++ b/SCons/Tool/MSCommon/MSVC/Config.py @@ -393,4 +393,3 @@ def verify(): if vc_version not in MSVC_VERSION_INTERNAL: err_msg = f'vc_version {vc_version!r} not in MSVC_VERSION_INTERNAL' raise MSVCInternalError(err_msg) - diff --git a/SCons/Tool/MSCommon/MSVC/Exceptions.py b/SCons/Tool/MSCommon/MSVC/Exceptions.py index 7b24a2b4b..8e2084e57 100644 --- a/SCons/Tool/MSCommon/MSVC/Exceptions.py +++ b/SCons/Tool/MSCommon/MSVC/Exceptions.py @@ -53,4 +53,3 @@ class MSVCSpectreLibsNotFound(MSVCUserError): class MSVCArgumentError(MSVCUserError): pass - diff --git a/SCons/Tool/MSCommon/MSVC/Policy.py b/SCons/Tool/MSCommon/MSVC/Policy.py index 7e11a63ba..8e74e374f 100644 --- a/SCons/Tool/MSCommon/MSVC/Policy.py +++ b/SCons/Tool/MSCommon/MSVC/Policy.py @@ -327,4 +327,3 @@ def msvc_scripterror_policy_contextmanager(MSVC_SCRIPTERROR_POLICY=None): prev_policy = msvc_set_scripterror_policy(MSVC_SCRIPTERROR_POLICY) yield msvc_set_scripterror_policy(prev_policy) - diff --git a/SCons/Tool/MSCommon/MSVC/PolicyTests.py b/SCons/Tool/MSCommon/MSVC/PolicyTests.py index a312d1191..596854e43 100644 --- a/SCons/Tool/MSCommon/MSVC/PolicyTests.py +++ b/SCons/Tool/MSCommon/MSVC/PolicyTests.py @@ -166,4 +166,3 @@ def test_scripterror_handler_error(self) -> None: if __name__ == "__main__": unittest.main() - diff --git a/SCons/Tool/MSCommon/MSVC/Registry.py b/SCons/Tool/MSCommon/MSVC/Registry.py index b5b72c42f..3e4506610 100644 --- a/SCons/Tool/MSCommon/MSVC/Registry.py +++ b/SCons/Tool/MSCommon/MSVC/Registry.py @@ -118,4 +118,3 @@ def vstudio_sxs_vc7(version): def devdiv_vs_servicing_component(version, component): return '\\'.join([r'DevDiv\VS\Servicing', version, component, 'Install']) - diff --git a/SCons/Tool/MSCommon/MSVC/RegistryTests.py b/SCons/Tool/MSCommon/MSVC/RegistryTests.py index 9c9ef89a0..9f65fe0e7 100644 --- a/SCons/Tool/MSCommon/MSVC/RegistryTests.py +++ b/SCons/Tool/MSCommon/MSVC/RegistryTests.py @@ -80,4 +80,3 @@ def test_windows_kit_query_paths(self) -> None: if __name__ == "__main__": unittest.main() - diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py index cc5a55976..0b309e88a 100644 --- a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py +++ b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py @@ -1100,4 +1100,3 @@ def reset() -> None: def verify() -> None: debug('') _verify_re_sdk_dispatch_map() - diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py b/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py index 308e43697..292522a91 100644 --- a/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py +++ b/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py @@ -668,4 +668,3 @@ def test_reset(self) -> None: if __name__ == "__main__": unittest.main() - diff --git a/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py b/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py index 76b9ed654..adec15b4e 100644 --- a/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py +++ b/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py @@ -233,4 +233,3 @@ def register_iserror(env, tool, msvc_exists_func): def reset() -> None: debug('') _Data.reset() - diff --git a/SCons/Tool/MSCommon/MSVC/Util.py b/SCons/Tool/MSCommon/MSVC/Util.py index 0da58e1e4..99d073b09 100644 --- a/SCons/Tool/MSCommon/MSVC/Util.py +++ b/SCons/Tool/MSCommon/MSVC/Util.py @@ -491,4 +491,3 @@ def msvc_sdk_version_components(version): ) return msvc_sdk_version_components_def - diff --git a/SCons/Tool/MSCommon/MSVC/UtilTests.py b/SCons/Tool/MSCommon/MSVC/UtilTests.py index 86ea58d87..b539d6f4a 100644 --- a/SCons/Tool/MSCommon/MSVC/UtilTests.py +++ b/SCons/Tool/MSCommon/MSVC/UtilTests.py @@ -289,4 +289,3 @@ def test_msvc_sdk_version_components(self) -> None: if __name__ == "__main__": unittest.main() - diff --git a/SCons/Tool/MSCommon/MSVC/Warnings.py b/SCons/Tool/MSCommon/MSVC/Warnings.py index cab5145a9..643bbd812 100644 --- a/SCons/Tool/MSCommon/MSVC/Warnings.py +++ b/SCons/Tool/MSCommon/MSVC/Warnings.py @@ -32,4 +32,3 @@ class VisualCWarning(SCons.Warnings.WarningOnByDefault): class MSVCScriptExecutionWarning(VisualCWarning): pass - diff --git a/SCons/Tool/MSCommon/MSVC/WinSDK.py b/SCons/Tool/MSCommon/MSVC/WinSDK.py index 7115d505e..94d5d63e3 100644 --- a/SCons/Tool/MSCommon/MSVC/WinSDK.py +++ b/SCons/Tool/MSCommon/MSVC/WinSDK.py @@ -261,4 +261,3 @@ def reset() -> None: def verify() -> None: debug('') _verify_sdk_dispatch_map() - diff --git a/SCons/Tool/MSCommon/MSVC/WinSDKTests.py b/SCons/Tool/MSCommon/MSVC/WinSDKTests.py index 10e68f3d6..34027d79f 100644 --- a/SCons/Tool/MSCommon/MSVC/WinSDKTests.py +++ b/SCons/Tool/MSCommon/MSVC/WinSDKTests.py @@ -129,4 +129,3 @@ def test_reset(self) -> None: if __name__ == "__main__": unittest.main() - diff --git a/SCons/Tool/MSCommon/MSVC/__init__.py b/SCons/Tool/MSCommon/MSVC/__init__.py index f87b0f1d8..8850e6393 100644 --- a/SCons/Tool/MSCommon/MSVC/__init__.py +++ b/SCons/Tool/MSCommon/MSVC/__init__.py @@ -53,4 +53,3 @@ def _reset() -> None: def _verify() -> None: _Dispatcher.verify() - diff --git a/SCons/Tool/MSCommon/README.rst b/SCons/Tool/MSCommon/README.rst index 33649fbe2..88ca5679d 100644 --- a/SCons/Tool/MSCommon/README.rst +++ b/SCons/Tool/MSCommon/README.rst @@ -752,4 +752,3 @@ into the current document format as appropriate. - Since msvc_exists chain of calls does not look at version, we can proceed to compiler setup if *any* msvc was found, even if the one requested wasn't found. - diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py index 690f07776..358588f9f 100644 --- a/SCons/Tool/MSCommon/vc.py +++ b/SCons/Tool/MSCommon/vc.py @@ -2883,4 +2883,3 @@ def msvc_query_version_toolset(version=None, prefer_newest: bool=True, vswhere_e # internal consistency check (should be last) MSVC._verify() - diff --git a/SCons/Tool/clangCommon/__init__.py b/SCons/Tool/clangCommon/__init__.py index 55014579f..fb03e26f0 100644 --- a/SCons/Tool/clangCommon/__init__.py +++ b/SCons/Tool/clangCommon/__init__.py @@ -15,4 +15,4 @@ def get_clang_install_dirs(platform): if platform == 'win32': return clang_win32_dirs else: - return [] \ No newline at end of file + return [] diff --git a/SCons/Tool/docbook/docs/html.xsl b/SCons/Tool/docbook/docs/html.xsl index 4ea232ed5..6ddc7a91f 100644 --- a/SCons/Tool/docbook/docs/html.xsl +++ b/SCons/Tool/docbook/docs/html.xsl @@ -33,4 +33,3 @@ set toc,title - diff --git a/SCons/Tool/docbook/docs/pdf.xsl b/SCons/Tool/docbook/docs/pdf.xsl index 63008d567..376fa6276 100644 --- a/SCons/Tool/docbook/docs/pdf.xsl +++ b/SCons/Tool/docbook/docs/pdf.xsl @@ -39,4 +39,3 @@ set toc,title - diff --git a/SCons/Tool/javacTests.py b/SCons/Tool/javacTests.py index 73b94b879..f0349efd2 100644 --- a/SCons/Tool/javacTests.py +++ b/SCons/Tool/javacTests.py @@ -98,7 +98,7 @@ def test_default_unset(self) -> None: ['-foopath', '/foo'], '/foo', '') - + def test_list_within_list(self) -> None: self.assert_pathopt(['-foopath', os.pathsep.join(['/foo','/bar'])], ['/foo', ['/bar']]) diff --git a/SCons/Tool/linkCommon/README.md b/SCons/Tool/linkCommon/README.md index 4a83c16bb..07219220c 100644 --- a/SCons/Tool/linkCommon/README.md +++ b/SCons/Tool/linkCommon/README.md @@ -40,7 +40,7 @@ Which will have a soname baked into it as one of the * `${SHLIBPREFIX}lib_name${major version only from SHLIBVERSION}${SHLIBSUFFIX}` * `-Wl,-compatibility_version,%s` * `-Wl,-current_version,%s` - + For **applelink** the version has to follow these rules to verify that the version # is valid. * For version # = X[.Y[.Z]] @@ -48,7 +48,7 @@ For **applelink** the version has to follow these rules to verify that the versi * where Y either not specified or 0-255 * where Z either not specified or 0-255 - + For most platforms this will lead to a series of symlinks eventually pointing to the actual shared library (or loadable module file). 1. `${SHLIBPREFIX}lib_name${SHLIBSUFFIX} -> ${SHLIBPREFIX}lib_name${SHLIBVERSION}${SHLIBSUFFIX}` 1. `${SHLIBPREFIX}lib_name${SOVERSION}${SHLIBSUFFIX} -> ${SHLIBPREFIX}lib_name${SHLIBVERSION}${SHLIBSUFFIX}` @@ -84,6 +84,5 @@ Maybe we can force one at that point? SOVERSION can be specified, if not, then defaults to major portion of SHLIBVERSION SONAME can be specified, if not defaults to ${SHLIBPREFIX}lib_name${SOVERSION} -NOTE: mongodb uses Append(SHLIBEMITTER=.. ) for their libdeps stuff. (So test +NOTE: mongodb uses Append(SHLIBEMITTER=.. ) for their libdeps stuff. (So test with that once you have new logic working) - diff --git a/SCons/__init__.py b/SCons/__init__.py index 63f8380c9..710d70a7d 100644 --- a/SCons/__init__.py +++ b/SCons/__init__.py @@ -6,4 +6,4 @@ __revision__="190853a12d8c2128f29abe849a6a162f0ed9f049" __build__="190853a12d8c2128f29abe849a6a162f0ed9f049" # make sure compatibility is always in place -import SCons.compat # noqa \ No newline at end of file +import SCons.compat # noqa diff --git a/bench/time_member.py b/bench/time_member.py index d664c0c19..cf5ee61ad 100644 --- a/bench/time_member.py +++ b/bench/time_member.py @@ -46,4 +46,3 @@ def test_no_find_method() -> bool: print(f'.find() method time: {time_find:.6f} seconds') print(f'"not in" operator time: {time_not_in:.6f} seconds') print(f'.find() method time: {time_no_find:.6f} seconds') - diff --git a/bin/check_new_contributors.py b/bin/check_new_contributors.py index 4935f5175..ba06bee01 100755 --- a/bin/check_new_contributors.py +++ b/bin/check_new_contributors.py @@ -47,7 +47,7 @@ def get_contributors_since(tag: str) -> Set[Tuple[str, str]]: # Format: Name|Email cmd = ['git', 'log', f'{tag}..HEAD', '--format=%aN|%aE'] output = get_git_output(cmd) - + contributors = set() if output: for line in output.split('\n'): @@ -72,7 +72,7 @@ def get_prior_emails(tag: str) -> Set[str]: print("Gathering prior contributors (this may take a moment)...") cmd = ['git', 'log', tag, '--format=%aE'] output = get_git_output(cmd) - + prior_emails = set() if output: for line in output.split('\n'): @@ -102,30 +102,30 @@ def main() -> None: # Get all prior emails prior_emails = get_prior_emails(args.tag) - + # Prepare data for display with deduplication # Map: display_name -> is_new (boolean) contributor_status: Dict[str, bool] = {} - + for name, email in recent_contributors: display_name = name if name else email is_new_email = email.lower() not in prior_emails - + if display_name not in contributor_status: contributor_status[display_name] = is_new_email else: - # If the contributor was previously marked as new, but this email + # If the contributor was previously marked as new, but this email # is NOT new, then the contributor is not new. # If they were already marked as not new, they stay not new. if contributor_status[display_name] and not is_new_email: contributor_status[display_name] = False - + # Convert to list for sorting and display display_list = [(name, is_new) for name, is_new in contributor_status.items()] - + # Sort by display name (case insensitive) display_list.sort(key=lambda x: x[0].lower()) - + # Calculate max length for alignment if display_list: max_length = max(len(x[0]) for x in display_list) @@ -134,7 +134,7 @@ def main() -> None: print(f"\nContributors since {args.tag}:") print("-" * 40) - + for display_name, is_new in display_list: # Align left with padding if is_new: @@ -143,4 +143,4 @@ def main() -> None: print(f"{display_name}") if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/bin/scp-sourceforge b/bin/scp-sourceforge index 07df3ea94..372dfe4f9 100755 --- a/bin/scp-sourceforge +++ b/bin/scp-sourceforge @@ -1,5 +1,5 @@ #!/bin/bash -set -x +set -x set -e if [ -z "$1" ]; then diff --git a/bin/xml_export b/bin/xml_export index bc9ccbdb8..e9286a9d2 100644 --- a/bin/xml_export +++ b/bin/xml_export @@ -180,7 +180,7 @@ in all copies or substantial portions of the Software. 2. Neither the names of VA Software Corporation, OSDN, SourceForge.net, the SourceForge.net Site Documentation project, nor the names of its contributors may be used to endorse or promote products derived from -the Software without specific prior written permission of OSDN. +the Software without specific prior written permission of OSDN. 3. The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the Software without specific, diff --git a/bin/xml_export-README b/bin/xml_export-README index 82e35242b..5c8819594 100644 --- a/bin/xml_export-README +++ b/bin/xml_export-README @@ -52,5 +52,3 @@ of the provided manual. The authoritative source of this software is: https://sourceforge.net/projects/sitedocs - - diff --git a/lgtm.yml b/lgtm.yml index 952122d73..eed64742b 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -24,19 +24,19 @@ path_classifiers: # and the test runner - runtest.py # The default behavior is to tag all files created during the - # build as `generated`. Results are hidden for generated code. You can tag + # build as `generated`. Results are hidden for generated code. You can tag # further files as being generated by adding them to the `generated` section. generated: - build # By default, all files not checked into the repository are considered to be # 'generated'. - # The default behavior is to tag library code as `library`. Results are hidden + # The default behavior is to tag library code as `library`. Results are hidden # for library code. You can tag further files as being library code by adding them # to the `library` section. library: - exclude: path/to/libary/code/**/*.c - # The default behavior is to tag template files as `template`. Results are hidden - # for template files. You can tag further files as being template files by adding + # The default behavior is to tag template files as `template`. Results are hidden + # for template files. You can tag further files as being template files by adding # them to the `template` section. template: - template @@ -74,7 +74,7 @@ path_classifiers: # block, with one or more steps. # ######################################################################################### -extraction: +extraction: javascript: # The `prepare` step exists for customization on LGTM.com only. # prepare: @@ -102,12 +102,12 @@ extraction: # # The `packages` section is valid for LGTM.com only. It names packages to # # be installed. # packages: libpng-dev - # This step is useful for Python analysis where you want to prepare the - # environment for the `python_setup` step without changing the default behavior + # This step is useful for Python analysis where you want to prepare the + # environment for the `python_setup` step without changing the default behavior # for that step. after_prepare: - export PATH=$LGTM_WORKSPACE/tools:$PATH - # This sets up the Python interpreter and virtual environment, ready for the + # This sets up the Python interpreter and virtual environment, ready for the # `index` step to extract the codebase. python_setup: # Specify packages that should NOT be installed despite being mentioned in the diff --git a/runtest.py b/runtest.py index 506cee93a..816f525ff 100755 --- a/runtest.py +++ b/runtest.py @@ -170,7 +170,7 @@ def execute(self, env: dict, allow_pipe_files: bool = True) -> None: # subprocess.PIPE. with tempfile.TemporaryFile(mode='w+t') as tmp_stdout, \ tempfile.TemporaryFile(mode='w+t') as tmp_stderr: - + cp = subprocess.run( self.command_args, stdout=tmp_stdout, @@ -487,7 +487,7 @@ def setup_logging(args: argparse.Namespace, stats: Summary): """ logger = logging.getLogger("runtest.console") logger.setLevel(logging.DEBUG) - + # Create stdout handler for logging to the console console_handler = logging.StreamHandler(sys.stdout) if not args.printcommand: @@ -583,14 +583,14 @@ def format(self, record): XmlFormatter.wrap_output = False else: xml_handler = logging.FileHandler(filename=args.xml, mode='w') - + xml_handler.setLevel(logging.DEBUG) xml_handler.setFormatter(XmlFormatter()) xml_logger.addHandler(xml_handler) else: xml_handler = logging.NullHandler() xml_logger.addHandler(xml_handler) - + return logger, xml_logger @@ -602,12 +602,12 @@ def log_result(t: Test, context: RunContext) -> None: context: The run context. """ times = f"Test execution time: {t.test_time:.1f} seconds" if context.args.print_times else "" - + output = f"{t.headline}{t.command_str}" if not context.args.short_progress: if t.stdout: output += t.stdout if t.stderr: output += t.stderr - + output += times context.logger.info(output) @@ -629,13 +629,13 @@ def run_test(t: Test, context: RunContext) -> None: if context.args.devmode: command_args.append('-X dev') command_args.append(str(t.path)) - + if context.args.runner and t.path in context.unittests: command_args.append('--runner ' + context.args.runner) - + t.command_args = [context.args.python] + command_args t.command_str = " ".join(t.command_args) + "\n" - + if context.args.print_progress: t.headline += ( f"{t.testno}/{context.stats.total_num_tests} " @@ -692,7 +692,7 @@ def setup_env(args: argparse.Namespace) -> None: os.environ['TESTCMD_VERBOSE'] = str(args.verbose) cwd = Path.cwd() - + # Baseline logic if not args.baseline or args.baseline == '.': baseline = cwd @@ -737,14 +737,14 @@ def setup_env(args: argparse.Namespace) -> None: # Insert scons path and path for testing framework to PYTHONPATH scriptpath = Path(__file__).resolve().parent frameworkpath = scriptpath / 'testing' / 'framework' - + paths = [str(scons_lib_dir), str(frameworkpath)] if scons_lib_dir == '': paths = [str(frameworkpath)] # handle empty scons_lib_dir - + existing_pythonpath = os.environ.get('PYTHONPATH') if existing_pythonpath: paths.append(existing_pythonpath) - + testenv['PYTHONPATH'] = os.pathsep.join(paths) # Windows check @@ -773,7 +773,7 @@ def discover_tests(args: argparse.Namespace, parser: argparse.ArgumentParser) -> """ unittests = [] endtests = [] - + if args.testlistfile: tests = scanlist(args.testlistfile) else: @@ -788,7 +788,7 @@ def discover_tests(args: argparse.Namespace, parser: argparse.ArgumentParser) -> # Path(str) cleans simple ./ but let's ensure if str(path).startswith('.') and len(str(path)) > 1 and str(path)[1] in (os.sep, os.altsep or '/') : path = Path(str(path)[2:]) - + if path.exists(): if path.is_dir(): parts = path.parts @@ -845,7 +845,7 @@ def create_run_context(args, stats, logger, unittests): args.python = sys.executable os.environ["python_executable"] = args.python stats.python = args.python - + scriptpath = Path(__file__).resolve().parent debug = "pdb" if args.debug else None @@ -873,7 +873,7 @@ def execute_tests(test_objects: list[Test], context: RunContext) -> None: testq = Queue() for test in test_objects: testq.put(test) - + # Add None markers to stop threads for _ in range(context.args.jobs): testq.put(None) @@ -881,7 +881,7 @@ def execute_tests(test_objects: list[Test], context: RunContext) -> None: threads = [TestRunner(queue=testq, context=context) for _ in range(context.args.jobs)] for thread in threads: thread.start() - + for thread in threads: thread.join() @@ -964,23 +964,23 @@ def main(): args, parser = parse_args() stats = Summary(jobs=args.jobs) logger, xml_logger = setup_logging(args, stats) - + setup_env(args) - + tests, unittests = discover_tests(args, parser) test_objects = [Test(t) for t in tests] - + if args.list_only: for t in test_objects: print(t.path) sys.exit(0) stats.total_num_tests = len(test_objects) - + context = create_run_context(args, stats, logger, unittests) - + execute_tests(test_objects, context) display_results(context, test_objects, xml_logger) if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/src/README.txt b/src/README.txt index a723f0211..ddb5917b1 100644 --- a/src/README.txt +++ b/src/README.txt @@ -1,2 +1,2 @@ This directory contains legacy test files. -They need to be reviewed to see if they are useful and/or can be made usable or deleted. \ No newline at end of file +They need to be reviewed to see if they are useful and/or can be made usable or deleted. diff --git a/test/CacheDir/double_cachedir_fixture/SConstruct b/test/CacheDir/double_cachedir_fixture/SConstruct index 34c27b001..fedc5a9c1 100644 --- a/test/CacheDir/double_cachedir_fixture/SConstruct +++ b/test/CacheDir/double_cachedir_fixture/SConstruct @@ -37,4 +37,3 @@ cloned = env.Clone() cloned.Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE')) env.CacheDir('cache1', CustomCacheDir1) - diff --git a/test/Configure/fixture/checklib_extra/SConstruct b/test/Configure/fixture/checklib_extra/SConstruct index 82bf5aae4..94ac8c8ad 100644 --- a/test/Configure/fixture/checklib_extra/SConstruct +++ b/test/Configure/fixture/checklib_extra/SConstruct @@ -28,4 +28,3 @@ env = conf.Finish() # Disabled for now, because that's trickier in Windows (the rpath # only works for Linux) # env.Program(target="testlibs", source="src/test.c") - diff --git a/test/Configure/fixture/checklib_extra/libA/SConstruct b/test/Configure/fixture/checklib_extra/libA/SConstruct index e75e1e1ca..a0f67cfac 100644 --- a/test/Configure/fixture/checklib_extra/libA/SConstruct +++ b/test/Configure/fixture/checklib_extra/libA/SConstruct @@ -3,4 +3,3 @@ # Copyright The SCons Foundation SharedLibrary(target='A', source=['libA.c'], CPPDEFINES='BUILDINGSHAREDLIB') - diff --git a/test/Configure/is_conftest/fixture/SConstruct b/test/Configure/is_conftest/fixture/SConstruct index 5494ea516..7187a18fb 100644 --- a/test/Configure/is_conftest/fixture/SConstruct +++ b/test/Configure/is_conftest/fixture/SConstruct @@ -22,5 +22,3 @@ env = conf.Finish() for node in env.Glob(conf.confdir.path + '/*'): if not node.is_conftest(): print("FAIL") - - diff --git a/test/D/Issues/2939_Ariovistus/Project/test/test1/stuff.cpp b/test/D/Issues/2939_Ariovistus/Project/test/test1/stuff.cpp index a19fb34ff..2c48b2c75 100644 --- a/test/D/Issues/2939_Ariovistus/Project/test/test1/stuff.cpp +++ b/test/D/Issues/2939_Ariovistus/Project/test/test1/stuff.cpp @@ -12,5 +12,5 @@ int X::y(){ } X *SomeX() { - return new X(); + return new X(); } diff --git a/test/D/Issues/2940_Ariovistus/Project/test/test1/stuff.cpp b/test/D/Issues/2940_Ariovistus/Project/test/test1/stuff.cpp index a19fb34ff..2c48b2c75 100644 --- a/test/D/Issues/2940_Ariovistus/Project/test/test1/stuff.cpp +++ b/test/D/Issues/2940_Ariovistus/Project/test/test1/stuff.cpp @@ -12,5 +12,5 @@ int X::y(){ } X *SomeX() { - return new X(); + return new X(); } diff --git a/test/D/Issues/2994/Project/main.d b/test/D/Issues/2994/Project/main.d index 8bea7ffea..c2aef37de 100644 --- a/test/D/Issues/2994/Project/main.d +++ b/test/D/Issues/2994/Project/main.d @@ -5,11 +5,10 @@ /* This program prints a hello world message to the console. */ - + import std.stdio; - + void main() { writeln("Hello, World!"); } - diff --git a/test/D/di/Image/SConstruct_template b/test/D/di/Image/SConstruct_template index ae8443081..ebd77a3fd 100644 --- a/test/D/di/Image/SConstruct_template +++ b/test/D/di/Image/SConstruct_template @@ -13,5 +13,5 @@ env = Environment( # o2 = env.Object('helloWorldMain.d') # env.Program('hw', [o1[0], o2[0]]) -# Alternatively +# Alternatively env.Program('hw', ['helloWorldMain.d','source/helloWorld.d']) diff --git a/test/Decider/MD5-winonly-fixture/test_lex.l b/test/Decider/MD5-winonly-fixture/test_lex.l index 269b98487..e9ced46e2 100644 --- a/test/Decider/MD5-winonly-fixture/test_lex.l +++ b/test/Decider/MD5-winonly-fixture/test_lex.l @@ -7,4 +7,3 @@ int c; %% %% - diff --git a/test/Docbook/basedir/htmlchunked/image/SConstruct b/test/Docbook/basedir/htmlchunked/image/SConstruct index 87a46586a..5c702fcf0 100644 --- a/test/Docbook/basedir/htmlchunked/image/SConstruct +++ b/test/Docbook/basedir/htmlchunked/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookHtmlChunked('manual', xsl='html.xsl', base_dir='output/') - diff --git a/test/Docbook/basedir/htmlchunked/image/manual.xml b/test/Docbook/basedir/htmlchunked/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/basedir/htmlchunked/image/manual.xml +++ b/test/Docbook/basedir/htmlchunked/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/basedir/htmlhelp/image/SConstruct b/test/Docbook/basedir/htmlhelp/image/SConstruct index 3ca5e8f71..952c85796 100644 --- a/test/Docbook/basedir/htmlhelp/image/SConstruct +++ b/test/Docbook/basedir/htmlhelp/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookHtmlhelp('manual', xsl='htmlhelp.xsl', base_dir='output/') - diff --git a/test/Docbook/basedir/htmlhelp/image/manual.xml b/test/Docbook/basedir/htmlhelp/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/basedir/htmlhelp/image/manual.xml +++ b/test/Docbook/basedir/htmlhelp/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/basedir/slideshtml/image/.exclude_tests b/test/Docbook/basedir/slideshtml/image/.exclude_tests index 966db3c5d..394a32d3d 100644 --- a/test/Docbook/basedir/slideshtml/image/.exclude_tests +++ b/test/Docbook/basedir/slideshtml/image/.exclude_tests @@ -1 +1 @@ -xsltver.py \ No newline at end of file +xsltver.py diff --git a/test/Docbook/basedir/slideshtml/image/SConstruct b/test/Docbook/basedir/slideshtml/image/SConstruct index f9b02dd62..774b7e7c8 100644 --- a/test/Docbook/basedir/slideshtml/image/SConstruct +++ b/test/Docbook/basedir/slideshtml/image/SConstruct @@ -10,8 +10,7 @@ ns_ext = '' if v >= (1, 78, 0): # Use namespace-aware input file ns_ext = 'ns' - + DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookSlidesHtml('virt'+ns_ext, xsl='slides.xsl', base_dir='output/') - diff --git a/test/Docbook/basedir/slideshtml/image/virt.xml b/test/Docbook/basedir/slideshtml/image/virt.xml index 9cdf77870..3223b6871 100644 --- a/test/Docbook/basedir/slideshtml/image/virt.xml +++ b/test/Docbook/basedir/slideshtml/image/virt.xml @@ -30,4 +30,3 @@ - diff --git a/test/Docbook/basedir/slideshtml/image/virtns.xml b/test/Docbook/basedir/slideshtml/image/virtns.xml index f64c624cf..2b9b39e10 100644 --- a/test/Docbook/basedir/slideshtml/image/virtns.xml +++ b/test/Docbook/basedir/slideshtml/image/virtns.xml @@ -30,4 +30,3 @@ - diff --git a/test/Docbook/basic/epub/image/manual.xml b/test/Docbook/basic/epub/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/basic/epub/image/manual.xml +++ b/test/Docbook/basic/epub/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/basic/html/image/SConstruct b/test/Docbook/basic/html/image/SConstruct index 4a9d07455..fda83daaf 100644 --- a/test/Docbook/basic/html/image/SConstruct +++ b/test/Docbook/basic/html/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookHtml('manual') - diff --git a/test/Docbook/basic/html/image/manual.xml b/test/Docbook/basic/html/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/basic/html/image/manual.xml +++ b/test/Docbook/basic/html/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/basic/htmlchunked/image/SConstruct b/test/Docbook/basic/htmlchunked/image/SConstruct index 05a617ffa..0d34315cc 100644 --- a/test/Docbook/basic/htmlchunked/image/SConstruct +++ b/test/Docbook/basic/htmlchunked/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookHtmlChunked('manual') - diff --git a/test/Docbook/basic/htmlchunked/image/manual.xml b/test/Docbook/basic/htmlchunked/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/basic/htmlchunked/image/manual.xml +++ b/test/Docbook/basic/htmlchunked/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/basic/htmlhelp/image/SConstruct b/test/Docbook/basic/htmlhelp/image/SConstruct index 433a1c3c3..b4921692b 100644 --- a/test/Docbook/basic/htmlhelp/image/SConstruct +++ b/test/Docbook/basic/htmlhelp/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookHtmlhelp('manual') - diff --git a/test/Docbook/basic/htmlhelp/image/manual.xml b/test/Docbook/basic/htmlhelp/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/basic/htmlhelp/image/manual.xml +++ b/test/Docbook/basic/htmlhelp/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/basic/man/image/SConstruct b/test/Docbook/basic/man/image/SConstruct index 2dcdb6ed2..6943fa102 100644 --- a/test/Docbook/basic/man/image/SConstruct +++ b/test/Docbook/basic/man/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookMan('refdb') - diff --git a/test/Docbook/basic/pdf/image/SConstruct b/test/Docbook/basic/pdf/image/SConstruct index e863047fb..8b7afd169 100644 --- a/test/Docbook/basic/pdf/image/SConstruct +++ b/test/Docbook/basic/pdf/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookPdf('manual') - diff --git a/test/Docbook/basic/pdf/image/manual.xml b/test/Docbook/basic/pdf/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/basic/pdf/image/manual.xml +++ b/test/Docbook/basic/pdf/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/basic/slideshtml/image/.exclude_tests b/test/Docbook/basic/slideshtml/image/.exclude_tests index 966db3c5d..394a32d3d 100644 --- a/test/Docbook/basic/slideshtml/image/.exclude_tests +++ b/test/Docbook/basic/slideshtml/image/.exclude_tests @@ -1 +1 @@ -xsltver.py \ No newline at end of file +xsltver.py diff --git a/test/Docbook/basic/slideshtml/image/virt.xml b/test/Docbook/basic/slideshtml/image/virt.xml index 9cdf77870..3223b6871 100644 --- a/test/Docbook/basic/slideshtml/image/virt.xml +++ b/test/Docbook/basic/slideshtml/image/virt.xml @@ -30,4 +30,3 @@ - diff --git a/test/Docbook/basic/slideshtml/image/virtns.xml b/test/Docbook/basic/slideshtml/image/virtns.xml index f64c624cf..2b9b39e10 100644 --- a/test/Docbook/basic/slideshtml/image/virtns.xml +++ b/test/Docbook/basic/slideshtml/image/virtns.xml @@ -30,4 +30,3 @@ - diff --git a/test/Docbook/basic/slidespdf/image/SConstruct b/test/Docbook/basic/slidespdf/image/SConstruct index fbe359cf8..82c1d23c4 100644 --- a/test/Docbook/basic/slidespdf/image/SConstruct +++ b/test/Docbook/basic/slidespdf/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookSlidesPdf('virt') - diff --git a/test/Docbook/basic/slidespdf/image/virt.xml b/test/Docbook/basic/slidespdf/image/virt.xml index 9cdf77870..3223b6871 100644 --- a/test/Docbook/basic/slidespdf/image/virt.xml +++ b/test/Docbook/basic/slidespdf/image/virt.xml @@ -30,4 +30,3 @@ - diff --git a/test/Docbook/basic/xinclude/image/SConstruct b/test/Docbook/basic/xinclude/image/SConstruct index a571345a4..6502d1fc4 100644 --- a/test/Docbook/basic/xinclude/image/SConstruct +++ b/test/Docbook/basic/xinclude/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookXInclude('manual_xi.xml','manual.xml') - diff --git a/test/Docbook/basic/xslt/image/in.xml b/test/Docbook/basic/xslt/image/in.xml index 4c1c41b2c..71718c587 100644 --- a/test/Docbook/basic/xslt/image/in.xml +++ b/test/Docbook/basic/xslt/image/in.xml @@ -74,4 +74,3 @@ env = Environment(ASCOMSTR = "Assembling $TARGET") - diff --git a/test/Docbook/basic/xslt/image/to_docbook.xslt b/test/Docbook/basic/xslt/image/to_docbook.xslt index 0b39c28fb..85152e02a 100644 --- a/test/Docbook/basic/xslt/image/to_docbook.xslt +++ b/test/Docbook/basic/xslt/image/to_docbook.xslt @@ -1,20 +1,20 @@ - - - + - + - + @@ -45,7 +45,7 @@ - + @@ -98,5 +98,5 @@ - + diff --git a/test/Docbook/basic/xsltsubdir/image/subdir/in.xml b/test/Docbook/basic/xsltsubdir/image/subdir/in.xml index 4c1c41b2c..71718c587 100644 --- a/test/Docbook/basic/xsltsubdir/image/subdir/in.xml +++ b/test/Docbook/basic/xsltsubdir/image/subdir/in.xml @@ -74,4 +74,3 @@ env = Environment(ASCOMSTR = "Assembling $TARGET") - diff --git a/test/Docbook/basic/xsltsubdir/image/subdir/to_docbook.xslt b/test/Docbook/basic/xsltsubdir/image/subdir/to_docbook.xslt index 0b39c28fb..85152e02a 100644 --- a/test/Docbook/basic/xsltsubdir/image/subdir/to_docbook.xslt +++ b/test/Docbook/basic/xsltsubdir/image/subdir/to_docbook.xslt @@ -1,20 +1,20 @@ - - - + - + - + @@ -45,7 +45,7 @@ - + @@ -98,5 +98,5 @@ - + diff --git a/test/Docbook/dependencies/xinclude/image/SConstruct b/test/Docbook/dependencies/xinclude/image/SConstruct index a571345a4..6502d1fc4 100644 --- a/test/Docbook/dependencies/xinclude/image/SConstruct +++ b/test/Docbook/dependencies/xinclude/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookXInclude('manual_xi.xml','manual.xml') - diff --git a/test/Docbook/rootname/htmlchunked/image/SConstruct b/test/Docbook/rootname/htmlchunked/image/SConstruct index 1187960a4..7a79e5105 100644 --- a/test/Docbook/rootname/htmlchunked/image/SConstruct +++ b/test/Docbook/rootname/htmlchunked/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookHtmlChunked('manual.html','manual', xsl='html.xsl') - diff --git a/test/Docbook/rootname/htmlchunked/image/manual.xml b/test/Docbook/rootname/htmlchunked/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/rootname/htmlchunked/image/manual.xml +++ b/test/Docbook/rootname/htmlchunked/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/rootname/htmlhelp/image/SConstruct b/test/Docbook/rootname/htmlhelp/image/SConstruct index 93cd47382..c9a877157 100644 --- a/test/Docbook/rootname/htmlhelp/image/SConstruct +++ b/test/Docbook/rootname/htmlhelp/image/SConstruct @@ -5,4 +5,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookHtmlhelp('manual.html', 'manual', xsl='htmlhelp.xsl') - diff --git a/test/Docbook/rootname/htmlhelp/image/manual.xml b/test/Docbook/rootname/htmlhelp/image/manual.xml index 067c76e56..8ffb62b44 100644 --- a/test/Docbook/rootname/htmlhelp/image/manual.xml +++ b/test/Docbook/rootname/htmlhelp/image/manual.xml @@ -232,7 +232,7 @@ env.EnableQt4Modules([ ]) # Add your CCFLAGS and CPPPATHs to env here... -env.Program('foo', Glob('*.cpp')) +env.Program('foo', Glob('*.cpp')) diff --git a/test/Docbook/rootname/slideshtml/image/.exclude_tests b/test/Docbook/rootname/slideshtml/image/.exclude_tests index 966db3c5d..394a32d3d 100644 --- a/test/Docbook/rootname/slideshtml/image/.exclude_tests +++ b/test/Docbook/rootname/slideshtml/image/.exclude_tests @@ -1 +1 @@ -xsltver.py \ No newline at end of file +xsltver.py diff --git a/test/Docbook/rootname/slideshtml/image/SConstruct b/test/Docbook/rootname/slideshtml/image/SConstruct index 21819368f..f96fa4b90 100644 --- a/test/Docbook/rootname/slideshtml/image/SConstruct +++ b/test/Docbook/rootname/slideshtml/image/SConstruct @@ -10,8 +10,7 @@ ns_ext = '' if v >= (1, 78, 0): # Use namespace-aware input file ns_ext = 'ns' - + DefaultEnvironment(tools=[]) env = Environment(tools=['docbook']) env.DocbookSlidesHtml('manual.html', 'virt'+ns_ext, xsl='slides.xsl') - diff --git a/test/Docbook/rootname/slideshtml/image/virt.xml b/test/Docbook/rootname/slideshtml/image/virt.xml index 9cdf77870..3223b6871 100644 --- a/test/Docbook/rootname/slideshtml/image/virt.xml +++ b/test/Docbook/rootname/slideshtml/image/virt.xml @@ -30,4 +30,3 @@ - diff --git a/test/Docbook/rootname/slideshtml/image/virtns.xml b/test/Docbook/rootname/slideshtml/image/virtns.xml index f64c624cf..2b9b39e10 100644 --- a/test/Docbook/rootname/slideshtml/image/virtns.xml +++ b/test/Docbook/rootname/slideshtml/image/virtns.xml @@ -30,4 +30,3 @@ - diff --git a/test/Fortran/fixture/gfortran_shared.f b/test/Fortran/fixture/gfortran_shared.f index 6efd8ffeb..718739ca0 100644 --- a/test/Fortran/fixture/gfortran_shared.f +++ b/test/Fortran/fixture/gfortran_shared.f @@ -1,3 +1,3 @@ SUBROUTINE gfortran_shared WRITE(*,*) "Hi from subroutine gfortran_shared!" - END SUBROUTINE gfortran_shared \ No newline at end of file + END SUBROUTINE gfortran_shared diff --git a/test/LEX/lex_headerfile/spaced path/src/lexer.l b/test/LEX/lex_headerfile/spaced path/src/lexer.l index 66b82a4b2..359bec94e 100644 --- a/test/LEX/lex_headerfile/spaced path/src/lexer.l +++ b/test/LEX/lex_headerfile/spaced path/src/lexer.l @@ -1 +1 @@ -%% \ No newline at end of file +%% diff --git a/test/LEX/lex_headerfile/spaced path/src/lexer2.l b/test/LEX/lex_headerfile/spaced path/src/lexer2.l index 66b82a4b2..359bec94e 100644 --- a/test/LEX/lex_headerfile/spaced path/src/lexer2.l +++ b/test/LEX/lex_headerfile/spaced path/src/lexer2.l @@ -1 +1 @@ -%% \ No newline at end of file +%% diff --git a/test/MSVC/msvc_fixture/test.cpp b/test/MSVC/msvc_fixture/test.cpp index edb2ef538..7772b3ddd 100644 --- a/test/MSVC/msvc_fixture/test.cpp +++ b/test/MSVC/msvc_fixture/test.cpp @@ -5,8 +5,8 @@ #include "StdAfx.h" #include "resource.h" -int main(void) -{ +int main(void) +{ char test[1024]; LoadString(GetModuleHandle(NULL), IDS_TEST, test, sizeof(test)); printf("%d %s\n", IDS_TEST, test); diff --git a/test/Parallel/failed-build/fixture/mycopy.py b/test/Parallel/failed-build/fixture/mycopy.py index 3826d8710..b6e770054 100644 --- a/test/Parallel/failed-build/fixture/mycopy.py +++ b/test/Parallel/failed-build/fixture/mycopy.py @@ -16,7 +16,7 @@ with open(sys.argv[1], 'wb') as ofp, open(sys.argv[2], 'rb') as ifp: ofp.write(ifp.read()) - + WAIT = 10 count = 0 diff --git a/test/Parallel/failed-build/fixture/myfail.py b/test/Parallel/failed-build/fixture/myfail.py index 4c6a8ab8d..e1db450a4 100644 --- a/test/Parallel/failed-build/fixture/myfail.py +++ b/test/Parallel/failed-build/fixture/myfail.py @@ -21,7 +21,7 @@ def check_test_state(): response.read() status = response.status return status == Response.OK.value - + while not check_test_state() and count < WAIT: time.sleep(0.1) count += 0.1 diff --git a/test/Progress/multi_target_fixture/SConstruct b/test/Progress/multi_target_fixture/SConstruct index 9a5ed1134..6f3c34735 100644 --- a/test/Progress/multi_target_fixture/SConstruct +++ b/test/Progress/multi_target_fixture/SConstruct @@ -17,4 +17,3 @@ env.Command( action=Action('echo $SOURCE > ${TARGETS[0]};echo $SOURCE > ${TARGETS[1]}', None), ) Progress(ProgressTest()) - diff --git a/test/Removed/README.md b/test/Removed/README.md index be3f9b9b5..87378f026 100644 --- a/test/Removed/README.md +++ b/test/Removed/README.md @@ -10,4 +10,3 @@ If there is a test that cannot be run, it will be in a subdirectory named Old, which will contain a sconstest.skip file, ensuring those test files are never loaded by the test framework. - diff --git a/test/SideEffect/Issues/3013/files/SConscript b/test/SideEffect/Issues/3013/files/SConscript index 53cfcdc8e..d62a0414e 100644 --- a/test/SideEffect/Issues/3013/files/SConscript +++ b/test/SideEffect/Issues/3013/files/SConscript @@ -6,4 +6,3 @@ Import('env') primary = env.make_file('output', 'test.cpp') this_causes_problems = env.SideEffect('output_side_effect', 'output') - diff --git a/test/SideEffect/Issues/3013/files/test.cpp b/test/SideEffect/Issues/3013/files/test.cpp index 94e2cad7d..f3fd024d6 100644 --- a/test/SideEffect/Issues/3013/files/test.cpp +++ b/test/SideEffect/Issues/3013/files/test.cpp @@ -3,4 +3,3 @@ // Copyright The SCons Foundation void some_function() {} - diff --git a/test/TEX/biber_biblatex2.py b/test/TEX/biber_biblatex2.py index 0049e5943..34de53dad 100644 --- a/test/TEX/biber_biblatex2.py +++ b/test/TEX/biber_biblatex2.py @@ -25,7 +25,7 @@ r""" Test creation of a Tex document that uses the biblatex package -It uses the default backend, could be bibtex or biber. +It uses the default backend, could be bibtex or biber. Require both be installed Test courtesy Rob Managan. diff --git a/test/TEX/biblatex_plain.py b/test/TEX/biblatex_plain.py index 20dc29ee7..328e866e1 100644 --- a/test/TEX/biblatex_plain.py +++ b/test/TEX/biblatex_plain.py @@ -86,4 +86,3 @@ test.must_not_exist([ f]) test.pass_test() - diff --git a/test/TaskMaster/bug_2811/fixture_dir/SConstruct b/test/TaskMaster/bug_2811/fixture_dir/SConstruct index 1f8c36430..5f740c5b0 100644 --- a/test/TaskMaster/bug_2811/fixture_dir/SConstruct +++ b/test/TaskMaster/bug_2811/fixture_dir/SConstruct @@ -7,7 +7,7 @@ This issue requires the following. 1. Generated source file which outputs 2 (or more) files 2. Action string gets scanned providing only compiler as part of implicit scan 3. Generated file gets built. Without the bugfix only the first target's .implicit list is cleared. -4. builder/executor/action gets tried again and implicits scanned. 2nd to Nth targets end up +4. builder/executor/action gets tried again and implicits scanned. 2nd to Nth targets end up with the compiler at the beginning of the implicit list and the rest of the scanned files added to that list. 5. That bimplicit gets saved into sconsign 6. Second run loads sconsign, now with generated file present a regular implicit scan occurs. This yields 2nd through diff --git a/test/TaskMaster/bug_2811/fixture_dir/a b/test/TaskMaster/bug_2811/fixture_dir/a index d3f62b800..20c248a3d 100644 --- a/test/TaskMaster/bug_2811/fixture_dir/a +++ b/test/TaskMaster/bug_2811/fixture_dir/a @@ -5,4 +5,4 @@ int dummy() { return 1; -} \ No newline at end of file +} diff --git a/test/fixture/SConstruct_HELP_AddOption.py b/test/fixture/SConstruct_HELP_AddOption.py index f4ac237a2..876b92ad5 100644 --- a/test/fixture/SConstruct_HELP_AddOption.py +++ b/test/fixture/SConstruct_HELP_AddOption.py @@ -19,4 +19,3 @@ Help(vars.GenerateHelpText(env), append=True, local_only=True) else: Help(vars.GenerateHelpText(env), append=True) - diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct_tools.py b/test/fixture/no_msvc/no_msvcs_sconstruct_tools.py index baac01bb2..d96ed8a2e 100644 --- a/test/fixture/no_msvc/no_msvcs_sconstruct_tools.py +++ b/test/fixture/no_msvc/no_msvcs_sconstruct_tools.py @@ -18,4 +18,3 @@ def DummyVsWhere(msvc_version, vswhere_exe): SCons.Tool.MSCommon.vc._find_vc_pdir_vswhere = DummyVsWhere env = SCons.Environment.Environment(tools=['myignoredefaultmsvctool']) - diff --git a/test/implicit-cache/RemoveImplicitDep.py b/test/implicit-cache/RemoveImplicitDep.py index d52926d19..49f6aa239 100644 --- a/test/implicit-cache/RemoveImplicitDep.py +++ b/test/implicit-cache/RemoveImplicitDep.py @@ -56,7 +56,7 @@ """) test.write(['src', 'f1.h'], 'blah' ) test.write(['src', 'f2.h'], 'blah' ) - + expect = test.wrap_stdout("""\ Touch("a") Touch("b") diff --git a/test/ninja/ninja_test_sconscripts/ninja_conftest b/test/ninja/ninja_test_sconscripts/ninja_conftest index 75498806e..4f715e122 100644 --- a/test/ninja/ninja_test_sconscripts/ninja_conftest +++ b/test/ninja/ninja_test_sconscripts/ninja_conftest @@ -2,7 +2,7 @@ # # Copyright The SCons Foundation -import sys +import sys SetOption('experimental','ninja') DefaultEnvironment(tools=[]) diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_mingw_depfile_format b/test/ninja/ninja_test_sconscripts/sconstruct_mingw_depfile_format index 4a48ca691..fc85a9980 100644 --- a/test/ninja/ninja_test_sconscripts/sconstruct_mingw_depfile_format +++ b/test/ninja/ninja_test_sconscripts/sconstruct_mingw_depfile_format @@ -8,4 +8,3 @@ DefaultEnvironment(tools=[]) env = Environment(tools=['mingw']) env.Tool('ninja') env['NINJA_DEPFILE_PARSE_FORMAT'] = 'msvc' - diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_ninja_command_line b/test/ninja/ninja_test_sconscripts/sconstruct_ninja_command_line index ffd0d036c..664ed1b94 100644 --- a/test/ninja/ninja_test_sconscripts/sconstruct_ninja_command_line +++ b/test/ninja/ninja_test_sconscripts/sconstruct_ninja_command_line @@ -14,5 +14,5 @@ env.VariantDir(env['OTHER_VAR'], 'src') env.Tool('ninja') with open('src/foo.c') as foo: env.Textfile('$BUILD/bar2.c', foo.read()) - + env.Program(target = 'foo', source = '$BUILD/bar2.c', CPPPATH='src') diff --git a/test/option/debug-action-timestamps.py b/test/option/debug-action-timestamps.py index dbcbc2340..8c99caaf7 100644 --- a/test/option/debug-action-timestamps.py +++ b/test/option/debug-action-timestamps.py @@ -36,7 +36,7 @@ def test_help_function(): # Before anything else, make sure we get valid --debug=action-timestamps results # when just running the help option. test.run(arguments = "-h --debug=action-timestamps") - + def build(): # Execute build test.run(arguments='--debug=action-timestamps') @@ -65,7 +65,7 @@ def test_correctness_of_timestamps(build_output): # Check if difference between timestamps is equal to duration matches = get_matches_from_output(build_output) - def match_to_float(m): + def match_to_float(m): return float(m[1][1]) execution_time = match_to_float(matches[0]) diff --git a/test/textfile/issue-3550.py b/test/textfile/issue-3550.py index 199d95de5..f71b55ae7 100644 --- a/test/textfile/issue-3550.py +++ b/test/textfile/issue-3550.py @@ -26,7 +26,7 @@ """ Test for GH Issue 3550 -You can't pass a Windows path in a value to be interpolated, +You can't pass a Windows path in a value to be interpolated, because SCons will try to pass it through re.sub which rejects certain character sequences. """ diff --git a/test/textfile/textfile.py b/test/textfile/textfile.py index d7d19e5e2..fdae689dc 100644 --- a/test/textfile/textfile.py +++ b/test/textfile/textfile.py @@ -46,7 +46,7 @@ textparts = ['lalala', '42', 'Goethe', 'Schiller', 'tanteratei', - '×'] # <-- this is unicode /xd7 symbol + '×'] # <-- this is unicode /xd7 symbol foo1Text = linesep.join(textparts) foo2Text = '|*'.join(textparts) foo1aText = foo1Text + linesep diff --git a/testing/buildbot.hosts b/testing/buildbot.hosts index 3e0be7d89..e3490b8f7 100644 --- a/testing/buildbot.hosts +++ b/testing/buildbot.hosts @@ -1 +1 @@ -localhost ansible_connection=local builder=xxx pass=xxx \ No newline at end of file +localhost ansible_connection=local builder=xxx pass=xxx diff --git a/testing/docker/docker.rst b/testing/docker/docker.rst index 58454860e..55f0ef0d1 100644 --- a/testing/docker/docker.rst +++ b/testing/docker/docker.rst @@ -89,7 +89,7 @@ which should result in an output similar to:: Insecure Registries: 127.0.0.0/8 Live Restore Enabled: false - + WARNING: No swap limit support Setup resolv.conf if necessary @@ -98,4 +98,3 @@ Setup resolv.conf if necessary Docker uses `etc/resolv.conf` DNS information and passes that automatically to containers. If the file is not configured properly or if entries are not valid, the server adds automatically public Google DNS nameservers (8.8.8.8 and 8.8.4.4) to the container's DNS configuration. - diff --git a/testing/docker/fedora32/build/Dockerfile b/testing/docker/fedora32/build/Dockerfile index d4ef38d3b..ea584be62 100644 --- a/testing/docker/fedora32/build/Dockerfile +++ b/testing/docker/fedora32/build/Dockerfile @@ -14,4 +14,3 @@ RUN mkdir /opt/offo && cd /opt/offo && curl -L --output offo-hyphenation-compile # RUN dnf -y install python3-pip && pip3 install epydoc CMD ["/bin/bash"] - diff --git a/testing/docker/fedora32/build/build_image.sh b/testing/docker/fedora32/build/build_image.sh index cad4c84b3..1167f72bc 100755 --- a/testing/docker/fedora32/build/build_image.sh +++ b/testing/docker/fedora32/build/build_image.sh @@ -13,4 +13,3 @@ docker build --network=host --file Dockerfile \ -t scons-build-fedora32:latest -t scons-build-fedora32:0.0.1 "$@" . cd $OLD_WD - diff --git a/testing/docker/fedora32/build/docker-compose.yml b/testing/docker/fedora32/build/docker-compose.yml index 1b0b8d0ad..fd91c6c95 100644 --- a/testing/docker/fedora32/build/docker-compose.yml +++ b/testing/docker/fedora32/build/docker-compose.yml @@ -19,4 +19,3 @@ services: entrypoint: /startup/setup_container.sh user: $DOCKERUID:$DOCKERGID working_dir: $HOME - diff --git a/testing/docker/fedora32/build/readme.rst b/testing/docker/fedora32/build/readme.rst index d593fe617..e38da742f 100644 --- a/testing/docker/fedora32/build/readme.rst +++ b/testing/docker/fedora32/build/readme.rst @@ -11,7 +11,7 @@ Building the image Build the local docker image by calling:: ./build_image.sh - + This will download the base image and install the required additional packages. Starting the image @@ -40,4 +40,3 @@ Simply call:: ./stop_build_shell.sh . - diff --git a/testing/docker/fedora32/build/start_build_shell.sh b/testing/docker/fedora32/build/start_build_shell.sh index 6905634dd..85b7ff05e 100755 --- a/testing/docker/fedora32/build/start_build_shell.sh +++ b/testing/docker/fedora32/build/start_build_shell.sh @@ -15,4 +15,3 @@ export DOCKERGID=$(id -g) docker-compose up -d cd $OLD_WD - diff --git a/testing/docker/fedora32/build/startup/setup_container.sh b/testing/docker/fedora32/build/startup/setup_container.sh index f65544193..9db286f11 100755 --- a/testing/docker/fedora32/build/startup/setup_container.sh +++ b/testing/docker/fedora32/build/startup/setup_container.sh @@ -7,4 +7,3 @@ # We start a separate xterm/terminal, such that the container doesn't exit right away... /usr/bin/xterm - diff --git a/testing/docker/fedora32/build/stop_build_shell.sh b/testing/docker/fedora32/build/stop_build_shell.sh index c0a9707ce..1d697cd42 100755 --- a/testing/docker/fedora32/build/stop_build_shell.sh +++ b/testing/docker/fedora32/build/stop_build_shell.sh @@ -14,4 +14,3 @@ export DOCKERGID=$(id -g) docker-compose down cd $OLD_WD - diff --git a/testing/docker/fedora32/test/Dockerfile b/testing/docker/fedora32/test/Dockerfile index 694810e67..b6391c861 100644 --- a/testing/docker/fedora32/test/Dockerfile +++ b/testing/docker/fedora32/test/Dockerfile @@ -7,4 +7,3 @@ LABEL version="0.0.1" maintainer="Dirk Baechle " description="SC RUN dnf -y install git bison cvs flex g++ gcc ghostscript m4 openssh-clients openssh-server python3-line_profiler python3-devel pypy3-devel rpm-build rcs java-1.8.0-openjdk swig texlive-scheme-basic texlive-base texlive-latex zip xterm vim vim-common nano CMD ["/bin/bash"] - diff --git a/testing/docker/fedora32/test/build_image.sh b/testing/docker/fedora32/test/build_image.sh index 9a9787870..62fb5ce27 100755 --- a/testing/docker/fedora32/test/build_image.sh +++ b/testing/docker/fedora32/test/build_image.sh @@ -13,4 +13,3 @@ docker build --network=host --file Dockerfile \ -t scons-test-fedora32:latest -t scons-test-fedora32:0.0.1 "$@" . cd $OLD_WD - diff --git a/testing/docker/fedora32/test/docker-compose.yml b/testing/docker/fedora32/test/docker-compose.yml index 7d25992e3..c875b7ed0 100644 --- a/testing/docker/fedora32/test/docker-compose.yml +++ b/testing/docker/fedora32/test/docker-compose.yml @@ -19,4 +19,3 @@ services: entrypoint: /startup/setup_container.sh user: $DOCKERUID:$DOCKERGID working_dir: $HOME - diff --git a/testing/docker/fedora32/test/readme.rst b/testing/docker/fedora32/test/readme.rst index da911761b..4ecb8933d 100644 --- a/testing/docker/fedora32/test/readme.rst +++ b/testing/docker/fedora32/test/readme.rst @@ -11,7 +11,7 @@ Building the image Build the local docker image by calling:: ./build_image.sh - + This will download the base image and install the required additional packages. Starting the image @@ -40,4 +40,3 @@ Simply call:: ./stop_test_shell.sh . - diff --git a/testing/docker/fedora32/test/start_test_shell.sh b/testing/docker/fedora32/test/start_test_shell.sh index 6905634dd..85b7ff05e 100755 --- a/testing/docker/fedora32/test/start_test_shell.sh +++ b/testing/docker/fedora32/test/start_test_shell.sh @@ -15,4 +15,3 @@ export DOCKERGID=$(id -g) docker-compose up -d cd $OLD_WD - diff --git a/testing/docker/fedora32/test/startup/setup_container.sh b/testing/docker/fedora32/test/startup/setup_container.sh index f65544193..9db286f11 100755 --- a/testing/docker/fedora32/test/startup/setup_container.sh +++ b/testing/docker/fedora32/test/startup/setup_container.sh @@ -7,4 +7,3 @@ # We start a separate xterm/terminal, such that the container doesn't exit right away... /usr/bin/xterm - diff --git a/testing/docker/fedora32/test/stop_test_shell.sh b/testing/docker/fedora32/test/stop_test_shell.sh index c0a9707ce..1d697cd42 100755 --- a/testing/docker/fedora32/test/stop_test_shell.sh +++ b/testing/docker/fedora32/test/stop_test_shell.sh @@ -14,4 +14,3 @@ export DOCKERGID=$(id -g) docker-compose down cd $OLD_WD - diff --git a/testing/docker/ubuntu19.10/build/build_image.sh b/testing/docker/ubuntu19.10/build/build_image.sh index 29e0f7e76..8fad62f42 100755 --- a/testing/docker/ubuntu19.10/build/build_image.sh +++ b/testing/docker/ubuntu19.10/build/build_image.sh @@ -13,4 +13,3 @@ docker build --network=host --file Dockerfile \ -t scons-build-ubuntu19.10:latest -t scons-build-ubuntu19.10:0.0.1 "$@" . cd $OLD_WD - diff --git a/testing/docker/ubuntu19.10/build/docker-compose.yml b/testing/docker/ubuntu19.10/build/docker-compose.yml index aa34bac1b..a5417c5dc 100644 --- a/testing/docker/ubuntu19.10/build/docker-compose.yml +++ b/testing/docker/ubuntu19.10/build/docker-compose.yml @@ -19,4 +19,3 @@ services: entrypoint: /startup/setup_container.sh user: $DOCKERUID:$DOCKERGID working_dir: $HOME - diff --git a/testing/docker/ubuntu19.10/build/readme.rst b/testing/docker/ubuntu19.10/build/readme.rst index b21d52c31..c5c4781d3 100644 --- a/testing/docker/ubuntu19.10/build/readme.rst +++ b/testing/docker/ubuntu19.10/build/readme.rst @@ -11,7 +11,7 @@ Building the image Build the local docker image by calling:: ./build_image.sh - + This will download the base image and install the required additional packages. Starting the image @@ -40,4 +40,3 @@ Simply call:: ./stop_build_shell.sh . - diff --git a/testing/docker/ubuntu19.10/build/start_build_shell.sh b/testing/docker/ubuntu19.10/build/start_build_shell.sh index 6905634dd..85b7ff05e 100755 --- a/testing/docker/ubuntu19.10/build/start_build_shell.sh +++ b/testing/docker/ubuntu19.10/build/start_build_shell.sh @@ -15,4 +15,3 @@ export DOCKERGID=$(id -g) docker-compose up -d cd $OLD_WD - diff --git a/testing/docker/ubuntu19.10/build/startup/setup_container.sh b/testing/docker/ubuntu19.10/build/startup/setup_container.sh index f65544193..9db286f11 100755 --- a/testing/docker/ubuntu19.10/build/startup/setup_container.sh +++ b/testing/docker/ubuntu19.10/build/startup/setup_container.sh @@ -7,4 +7,3 @@ # We start a separate xterm/terminal, such that the container doesn't exit right away... /usr/bin/xterm - diff --git a/testing/docker/ubuntu19.10/build/stop_build_shell.sh b/testing/docker/ubuntu19.10/build/stop_build_shell.sh index c0a9707ce..1d697cd42 100755 --- a/testing/docker/ubuntu19.10/build/stop_build_shell.sh +++ b/testing/docker/ubuntu19.10/build/stop_build_shell.sh @@ -14,4 +14,3 @@ export DOCKERGID=$(id -g) docker-compose down cd $OLD_WD - diff --git a/testing/docker/ubuntu19.10/test/Dockerfile b/testing/docker/ubuntu19.10/test/Dockerfile index a86947e97..697d7ac2b 100644 --- a/testing/docker/ubuntu19.10/test/Dockerfile +++ b/testing/docker/ubuntu19.10/test/Dockerfile @@ -7,4 +7,3 @@ LABEL version="0.0.1" maintainer="Dirk Baechle " description="SC RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git bison cssc cvs flex g++ gcc ghostscript m4 openssh-client openssh-server python3-profiler python3-all-dev pypy-dev rcs rpm openjdk-8-jdk swig texlive-base-bin texlive-extra-utils texlive-latex-base texlive-latex-extra zip xterm vim vim-common nano sudo CMD ["/bin/bash"] - diff --git a/testing/docker/ubuntu19.10/test/build_image.sh b/testing/docker/ubuntu19.10/test/build_image.sh index 92649a0c6..e1d08ef4c 100755 --- a/testing/docker/ubuntu19.10/test/build_image.sh +++ b/testing/docker/ubuntu19.10/test/build_image.sh @@ -13,4 +13,3 @@ docker build --network=host --file Dockerfile \ -t scons-test-ubuntu19.10:latest -t scons-test-ubuntu19.10:0.0.1 "$@" . cd $OLD_WD - diff --git a/testing/docker/ubuntu19.10/test/docker-compose.yml b/testing/docker/ubuntu19.10/test/docker-compose.yml index 1f3777f74..89a38e15a 100644 --- a/testing/docker/ubuntu19.10/test/docker-compose.yml +++ b/testing/docker/ubuntu19.10/test/docker-compose.yml @@ -19,4 +19,3 @@ services: entrypoint: /startup/setup_container.sh user: $DOCKERUID:$DOCKERGID working_dir: $HOME - diff --git a/testing/docker/ubuntu19.10/test/readme.rst b/testing/docker/ubuntu19.10/test/readme.rst index d7247d2c6..b26cf72dd 100644 --- a/testing/docker/ubuntu19.10/test/readme.rst +++ b/testing/docker/ubuntu19.10/test/readme.rst @@ -11,7 +11,7 @@ Building the image Build the local docker image by calling:: ./build_image.sh - + This will download the base image and install the required additional packages. Starting the image @@ -40,4 +40,3 @@ Simply call:: ./stop_test_shell.sh . - diff --git a/testing/docker/ubuntu19.10/test/start_test_shell.sh b/testing/docker/ubuntu19.10/test/start_test_shell.sh index 6905634dd..85b7ff05e 100755 --- a/testing/docker/ubuntu19.10/test/start_test_shell.sh +++ b/testing/docker/ubuntu19.10/test/start_test_shell.sh @@ -15,4 +15,3 @@ export DOCKERGID=$(id -g) docker-compose up -d cd $OLD_WD - diff --git a/testing/docker/ubuntu19.10/test/startup/setup_container.sh b/testing/docker/ubuntu19.10/test/startup/setup_container.sh index f65544193..9db286f11 100755 --- a/testing/docker/ubuntu19.10/test/startup/setup_container.sh +++ b/testing/docker/ubuntu19.10/test/startup/setup_container.sh @@ -7,4 +7,3 @@ # We start a separate xterm/terminal, such that the container doesn't exit right away... /usr/bin/xterm - diff --git a/testing/docker/ubuntu19.10/test/stop_test_shell.sh b/testing/docker/ubuntu19.10/test/stop_test_shell.sh index c0a9707ce..1d697cd42 100755 --- a/testing/docker/ubuntu19.10/test/stop_test_shell.sh +++ b/testing/docker/ubuntu19.10/test/stop_test_shell.sh @@ -14,4 +14,3 @@ export DOCKERGID=$(id -g) docker-compose down cd $OLD_WD - diff --git a/testing/framework/README.txt b/testing/framework/README.txt index 25b966e8e..c910dd778 100644 --- a/testing/framework/README.txt +++ b/testing/framework/README.txt @@ -45,5 +45,3 @@ the pieces here are local to SCons. TestSConsign.py Test infrastructure for the sconsign.py script. - - diff --git a/testing/framework/test-framework.rst b/testing/framework/test-framework.rst index e446a52e2..4a84666c0 100644 --- a/testing/framework/test-framework.rst +++ b/testing/framework/test-framework.rst @@ -904,4 +904,3 @@ Unittest-specific hints There is an assert method for checking that an exception happens (``self.assertRaises``), which is more readable than hand-coding something with a ``try`` block to check the exception was raised. Please use this! - diff --git a/timings/ElectricCloud/genscons.pl b/timings/ElectricCloud/genscons.pl index f573c1d22..f505a0b72 100755 --- a/timings/ElectricCloud/genscons.pl +++ b/timings/ElectricCloud/genscons.pl @@ -77,7 +77,7 @@ () -g Grouping : compile in groups of Grouping files (default $group) -u Lookups : number of lookups per source file (default $nlups) --h : this help message +-h : this help message You can edit the default values in genscons.pl @@ -143,7 +143,7 @@ sub gen_cfile { $idx2 = $fil[$idx] + 1; print CFILE "extern int printr_$file[$idx2] (char * fname);\n" . "int main (int argc, char * argv[]) {\n" - . "\tint i, mb_out;\n"; + . "\tint i, mb_out;\n"; print CFILE "\tprintr_$file[$idx2] (\"$filname[$idx]\");\n" . "\n" @@ -192,7 +192,7 @@ sub mkdirs { $foo = substr($basedir,9) . "/"; $libdir = substr($basedir,9); } - $bstr[$idx] = $basestr; + $bstr[$idx] = $basestr; $dirstr = $basedir; $dirstr =~ s|/|_|g; @@ -508,7 +508,7 @@ sub mkdirs { . "\tdirectories: " . fmt($totldirs) . "\n" . "\tsource files: " . fmt($numdirs * $nfils) . "\n" . "\tinclude files: " . fmt($numdirs * ($nfils + 1)) . "\n" - . "\tmakefiles: " . fmt($numdirs * $numMakefiles) + . "\tmakefiles: " . fmt($numdirs * $numMakefiles) . " ($numMakefiles per directory)\n" . "\ttotal files: " . fmt($totlfils) . "\n" . "\tlook-ups: >= " . fmt($totllups) . "\n" diff --git a/timings/changelog.html b/timings/changelog.html index 586ebadc6..a29fe3e46 100644 --- a/timings/changelog.html +++ b/timings/changelog.html @@ -100,7 +100,7 @@ msg = msg.replace(/\t/g, ' ' ); while (msg.charAt(0) == ' ') msg = msg.substring(1); - + var msg_clipped = msg.substring(0, 66); if (msg_clipped.length < msg.length) msg_clipped = msg_clipped + "..."; @@ -201,4 +201,3 @@ - diff --git a/timings/graph.html b/timings/graph.html index de12ff5b8..81411c612 100644 --- a/timings/graph.html +++ b/timings/graph.html @@ -313,13 +313,13 @@ // Change to the first detail tab for (var tab in Config.detailTabs) { change_view(tab); - break; + break; } } function change_view(target) { for (var tab in Config.detailTabs) { - document.getElementById(tab).style.display = + document.getElementById(tab).style.display = (tab == target ? "block" : "none"); } } @@ -389,7 +389,7 @@ } else { document.write("style=\"border-top: none\" "); } - document.write("class=\"selector\" onclick=\"change_view('" + document.write("class=\"selector\" onclick=\"change_view('" + tab + "')\">" + Config.detailTabs[tab] + ""); } diff --git a/timings/js/coordinates.js b/timings/js/coordinates.js index 69cb4c22d..ac480b704 100644 --- a/timings/js/coordinates.js +++ b/timings/js/coordinates.js @@ -12,7 +12,7 @@ */ function Coordinates(plotData) { this.plotData = plotData; - + height = window.innerHeight - 16; width = window.innerWidth - 16; @@ -76,7 +76,7 @@ Coordinates.prototype.xPoints = function(value) { */ Coordinates.prototype.yPoints = function(value) { /* Converts value to canvas Y position in pixels. */ - return this.heightMax - this.heightMax * (value - this.yMinValue) / + return this.heightMax - this.heightMax * (value - this.yMinValue) / this.yValueRange(); }; @@ -94,7 +94,7 @@ Coordinates.prototype.xValue = function(position) { * @param {number} position vertical point on canvas. */ Coordinates.prototype.yValue = function(position) { - /* Converts canvas Y pixels to value. + /* Converts canvas Y pixels to value. position is point value is from top. */ var position = this.heightMax - position; From d6860c0462d8e69354e5833c37f48f16454eb7a0 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Sat, 23 May 2026 12:31:17 -0500 Subject: [PATCH 3/3] prek changes to `.git-blame-ignore-revs` --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 164cdb6fe..c6b53a916 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,5 @@ fbb026ef1145fe29e0ec3c1b66a3e99cac51e18d c9d9fa58b796532320a2248ddc5be07b7280adf3 # Purge vim/emac variable bloat ad7207090187a6cd2657cce00096cfc4bc9c3010 +# Apply prek changes +94148bdd757c476efc0a66c43379ee194e107837