From f65c04aadc679de79e9517a0d0651cddf3d42006 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Fri, 22 Sep 2023 07:33:38 -0600 Subject: Bump dependency versions [skip appveyor] Sphinx ceiling version bumped to 6.x. While it *works* with current Sphinx 7.x, sphinx-book-theme is actually pinned to <7, so to avoid install complaints, leave Sphinx down-rev for now. lxml version pin bumped, and the fence for not installing on Python 3.12 is changed to 3.13 - PyPI packages for 3.12 are up. Update doc/generated/variables.mod as it contains new construction variables from the 4.6 development: all the generated files will be updated at release time, but this allows a build *without* regenerating to not fail. Signed-off-by: Mats Wichmann --- bin/docs-create-example-outputs.py | 6 +++++- bin/docs-update-generated.py | 10 +++++++--- bin/docs-validate.py | 4 ++++ doc/generated/variables.mod | 10 ++++++++++ requirements-dev.txt | 2 +- requirements-pkg.txt | 2 +- 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/bin/docs-create-example-outputs.py b/bin/docs-create-example-outputs.py index e5d40ce..2df6f90 100644 --- a/bin/docs-create-example-outputs.py +++ b/bin/docs-create-example-outputs.py @@ -1,8 +1,12 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: MIT +# +# Copyright The SCons Foundation +# # Searches through the whole doc/user tree and creates # all output files for the single examples. -# + import os import sys import SConsExamples diff --git a/bin/docs-update-generated.py b/bin/docs-update-generated.py index 9fbd95c..1599617 100644 --- a/bin/docs-update-generated.py +++ b/bin/docs-update-generated.py @@ -1,11 +1,15 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: MIT +# +# Copyright The SCons Foundation +# # Searches through the whole source tree and updates # the generated *.gen/*.mod files in the docs folder, keeping all # documentation for the tools, builders and functions... # as well as the entity declarations for them. # Uses scons-proc.py under the hood... -# + import os import sys import subprocess @@ -63,8 +67,8 @@ def generate_all(): print("Generation failed", file=sys.stderr) return False return True - - + + if __name__ == "__main__": if not generate_all(): sys.exit(1) diff --git a/bin/docs-validate.py b/bin/docs-validate.py index 6d8fd77..06a7906 100644 --- a/bin/docs-validate.py +++ b/bin/docs-validate.py @@ -1,5 +1,9 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: MIT +# +# Copyright The SCons Foundation +# # Searches through the whole source tree and validates all # documentation files against our own XSD in docs/xsd. # diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index c10e520..c3787ea 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -80,6 +80,10 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DFLAGPREFIX"> $DFLAGS"> $DFLAGSUFFIX"> +$DI_FILE_DIR"> +$DI_FILE_DIR_PREFIX"> +$DI_FILE_DIR_SUFFFIX"> +$DI_FILE_SUFFIX"> $DINCPREFIX"> $DINCSUFFIX"> $Dir"> @@ -662,6 +666,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $XGETTEXTPATHSUFFIX"> $YACC"> $YACC_GRAPH_FILE"> +$YACC_GRAPH_FILE_SUFFIX"> $YACC_HEADER_FILE"> $YACCCOM"> $YACCCOMSTR"> @@ -756,6 +761,10 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DFLAGPREFIX"> $DFLAGS"> $DFLAGSUFFIX"> +$DI_FILE_DIR"> +$DI_FILE_DIR_PREFIX"> +$DI_FILE_DIR_SUFFFIX"> +$DI_FILE_SUFFIX"> $DINCPREFIX"> $DINCSUFFIX"> $Dir"> @@ -1338,6 +1347,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $XGETTEXTPATHSUFFIX"> $YACC"> $YACC_GRAPH_FILE"> +$YACC_GRAPH_FILE_SUFFIX"> $YACC_HEADER_FILE"> $YACCCOM"> $YACCCOMSTR"> diff --git a/requirements-dev.txt b/requirements-dev.txt index 82faa28..8a526fe 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ # for now keep pinning "known working" lxml, # it's been a troublesome component in the past. # Skip lxml for win32 as no tests which require it currently pass on win32 -lxml==4.9.2; python_version < '3.12' and sys_platform != 'win32' +lxml==4.9.3; python_version < '3.13' and sys_platform != 'win32' ninja diff --git a/requirements-pkg.txt b/requirements-pkg.txt index 3fb4aeb..c83375e 100644 --- a/requirements-pkg.txt +++ b/requirements-pkg.txt @@ -8,7 +8,7 @@ readme-renderer # sphinx pinned because it has broken several times on new releases -sphinx < 6.0 +sphinx < 7.0 sphinx-book-theme rst2pdf -- cgit v0.12