Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
fbb026ef1145fe29e0ec3c1b66a3e99cac51e18d
# Black/Ruff'd test framework code.
c9d9fa58b796532320a2248ddc5be07b7280adf3
# Purge vim/emac variable bloat
ad7207090187a6cd2657cce00096cfc4bc9c3010
3 changes: 3 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
From John Doe:
- Whatever John Doe did.

From Thaddeus Crews:
- Purge vim/emac local variable bloat.

From William Deegan:
- Fix SCons Docbook schema to work with lxml > 5
- Update pyproject.toml to support Python 3.14 and remove restrictions on lxml version install
Expand Down
1 change: 1 addition & 0 deletions RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ DEVELOPMENT

- Introduce some unit tests for the file locking utility routines

- Purge vim/emac local variable bloat.
- Update pyproject.toml to support Python 3.14 and remove restrictions on lxml version install


Expand Down
6 changes: 0 additions & 6 deletions ReleaseConfig
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,3 @@ deprecated_python_version = (3, 7, 0)

# If copyright years is not given, the release year is used as the end.
copyright_years = '2001 - 2025'

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Action.py
Original file line number Diff line number Diff line change
Expand Up @@ -1611,9 +1611,3 @@ def __call__(self, *args, **kw):
ac = ActionCaller(self, args, kw)
action = Action(ac, strfunction=ac.strfunction)
return action

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/ActionTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -2403,9 +2403,3 @@ def test_scons_subproc_run(self):

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -910,9 +910,3 @@ def is_a_Builder(obj) -> bool:
return (isinstance(obj, BuilderBase)
or isinstance(obj, CompositeBuilder)
or callable(obj))

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/BuilderTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1661,9 +1661,3 @@ def test_src_builder(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/CacheDir.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,3 @@ def push(self, node):
def push_if_forced(self, node):
if cache_force:
return self.push(node)

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
5 changes: 0 additions & 5 deletions SCons/CacheDirTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,3 @@ def test_no_strfunction(self) -> None:

if __name__ == "__main__":
unittest.main()
# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
9 changes: 0 additions & 9 deletions SCons/Conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -859,12 +859,3 @@ def _lang2suffix(lang):
return ("C++", ".cpp", None)

return None, None, "Unsupported language: %s" % lang


# vim: set sw=4 et sts=4 tw=79 fo+=l:

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,3 @@ def trace_cleanup(traceFP) -> None:
PreviousTime = now
fp.write(msg)
fp.flush()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -751,9 +751,3 @@ def __lib_either_version_flag(env, version_var1, version_var2, flags_var):
'File': Variable_Method_Caller('TARGET', 'File'),
'RDirs': Variable_Method_Caller('TARGET', 'RDirs'),
}

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/DefaultsTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,3 @@ def test_processDefines(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -2904,9 +2904,3 @@ def subst_target_source(self, string, *args, **kwargs):
return SCons.Subst.scons_subst(*nargs, **nkw)

return _NoSubstitutionProxy(subject)

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/EnvironmentTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4331,9 +4331,3 @@ def test_subst_target_source(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,3 @@ def convert_to_BuildError(status, exc_info=None):
#import sys
#sys.stderr.write("convert_to_BuildError: status %s => (errstr %s, status %s)\n"%(status,buildError.errstr, buildError.status))
return buildError

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/ErrorsTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,3 @@ def __init__(self, name):

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,3 @@ def add_post_action(self, action) -> None:
def set_action_list(self, action) -> None:
self._morph()
self.set_action_list(action)

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/ExecutorTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,3 @@ def test_changed_sources_for_alwaysBuild(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Memoize.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,3 @@ def wrapper(self, *args, **kwargs):
else:
return fn
return decorator

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/MemoizeTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,3 @@ def test___call__(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Node/Alias.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,3 @@ def get_csig(self):
default_ans = AliasNameSpace()

SCons.Node.arg2nodes_lookups.append(default_ans.lookup)

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Node/AliasTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,3 @@ def test___init__(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Node/FS.py
Original file line number Diff line number Diff line change
Expand Up @@ -3852,9 +3852,3 @@ def invalidate_node_memos(targets) -> None:
node = get_default_fs().Entry(entry)
if node:
node.clear_memoized_values()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Node/FSTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4094,9 +4094,3 @@ def runTest(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
7 changes: 0 additions & 7 deletions SCons/Node/NodeTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1377,10 +1377,3 @@ def test___str__(self) -> None:

if __name__ == "__main__":
unittest.main()


# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
7 changes: 0 additions & 7 deletions SCons/Node/Python.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,3 @@ def ValueWithMemo(value, built_value=None, name=None):
v = Value(value, built_value, name)
_memo_lookup_map[memo_lookup_key] = v
return v


# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Node/PythonTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,3 @@ def test_value_set_name(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Node/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1799,9 +1799,3 @@ def is_done(self) -> bool:


arg2nodes_lookups = []

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/PathList.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,3 @@ def PathList(self, pathlist, split=True):
# TODO: removing the class object here means Sphinx doesn't pick up its
# docstrings: they're fine for reading here, but are not in API Docs.
del PathListCache

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/PathListTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,3 @@ def test_PathList(self) -> None:

if __name__ == "__main__":
unittest.main()

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
7 changes: 0 additions & 7 deletions SCons/Platform/PlatformTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,3 @@ def test_posix_escape(self) -> None:

if __name__ == "__main__":
unittest.main()


# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Platform/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,3 @@ def Platform(name = platform_default()):
module = platform_module(name)
spec = PlatformSpec(name, module.generate)
return spec

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Platform/aix.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,3 @@ def generate(env) -> None:
env['MAXLINELENGTH'] = 21576
env['SHLIBSUFFIX'] = '.a'
env['HOST_OS'] = 'aix'

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Platform/cygwin.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,3 @@ def generate(env) -> None:
env['TEMPFILEPREFIX'] = '@'
env['MAXLINELENGTH'] = 2048
env['HOST_OS'] = 'cygwin'

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
8 changes: 1 addition & 7 deletions SCons/Platform/darwin.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def generate(env) -> None:
# put macports paths at front to override Apple's versions, fink path is after
# For now let people who want Macports or Fink tools specify it!
# env['ENV']['PATH'] = '/opt/local/bin:/opt/local/sbin:' + env['ENV']['PATH'] + ':/sw/bin'

# Store extra system paths in env['ENV']['PATHOSX']

filelist = ['/etc/paths',]
Expand All @@ -63,9 +63,3 @@ def generate(env) -> None:
# Not sure why this wasn't the case all along?
if env['ENV'].get('PATHOSX', False) and os.environ.get('SCONS_USE_MAC_PATHS', False):
env.AppendENVPath('PATH',env['ENV']['PATHOSX'])

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Platform/hpux.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,3 @@ def generate(env) -> None:

env['SHLIBSUFFIX'] = '.sl'
env['HOST_OS'] = 'hpux'

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
6 changes: 0 additions & 6 deletions SCons/Platform/irix.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,3 @@
def generate(env) -> None:
posix.generate(env)
env['HOST_OS'] = 'irix'

# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
Loading