Merge branch 'master' into jbrill-gh4320-fix

6 files changed, 39 insertions, 17 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index f3cdede8c..43669e035 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,12 +8,23 @@ NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
 NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
-
+  From Ataf Fazledin Ahamed:
+    - Use of NotImplemented instead of NotImplementedError for special methods
+      of _ListVariable class
+  
   From Joseph Brill:
     - Add an optional argument list string to configures CheckFunc method so
       that the generated function argument list matches the function's
       prototype when including a header file. Fixes GH Issue #4320
 
+  From Michał Górny:
+    - Remove unecessary dependencies on pypi packages from setup.cfg
+
+  From Sten Grüner:
+    - Fix of the --debug=sconscript option to return exist statements when using return
+      statement with stop flag enabled
+
+
 
 RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700
 
diff --git a/RELEASE.txt b/RELEASE.txt
index d7b24fa0b..572ce4ba2 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -33,19 +33,19 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
 FIXES
 -----
 
-- List fixes of outright bugs
+- Fix of the --debug=sconscript option to return exist statements when using return
+  statement with stop flag enabled
 
 IMPROVEMENTS
 ------------
 
-- List improvements that wouldn't be visible to the user in the
-  documentation:  performance improvements (describe the circumstances
-  under which they would be observed), or major code cleanups
+- Use of NotImplemented instead of NotImplementedError for special methods
+  of _ListVariable class
 
 PACKAGING
 ---------
 
-- List changes in the way SCons is packaged and/or released
+- Remove unecessary dependencies on pypi packages from setup.cfg
 
 DOCUMENTATION
 -------------
diff --git a/SCons/Script/SConscript.py b/SCons/Script/SConscript.py
index 0d7508808..85070ab05 100644
--- a/SCons/Script/SConscript.py
+++ b/SCons/Script/SConscript.py
@@ -280,7 +280,10 @@ def _SConscript(fs, *files, **kw):
                             if SCons.Debug.sconscript_trace:
                                 print("scons: Exiting "+str(scriptname))
                         except SConscriptReturn:
-                            pass
+                            if SCons.Debug.sconscript_trace:
+                                print("scons: Exiting "+str(scriptname))
+                            else:
+                                pass
                     finally:
                         if Main.print_time:
                             elapsed = time.perf_counter() - start_time
diff --git a/SCons/Variables/ListVariable.py b/SCons/Variables/ListVariable.py
index bfa48f5eb..a0640e634 100644
--- a/SCons/Variables/ListVariable.py
+++ b/SCons/Variables/ListVariable.py
@@ -70,22 +70,22 @@ class _ListVariable(collections.UserList):
         self.allowedElems = sorted(allowedElems)
 
     def __cmp__(self, other):
-        raise NotImplementedError
+        return NotImplemented
 
     def __eq__(self, other):
-        raise NotImplementedError
+        return NotImplemented
 
     def __ge__(self, other):
-        raise NotImplementedError
+        return NotImplemented
 
     def __gt__(self, other):
-        raise NotImplementedError
+        return NotImplemented
 
     def __le__(self, other):
-        raise NotImplementedError
+        return NotImplemented
 
     def __lt__(self, other):
-        raise NotImplementedError
+        return NotImplemented
 
     def __str__(self) -> str:
         if not len(self):
diff --git a/setup.cfg b/setup.cfg
index b6d7a5e56..40e24e298 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,10 +45,6 @@ classifiers =
 [options]
 zip_safe = False
 python_requires = >=3.6
-install_requires = setuptools
-setup_requires =
-    setuptools
-    build
 include_package_data = True
 packages = find:
 
diff --git a/test/option/debug-sconscript.py b/test/option/debug-sconscript.py
index 9638f7914..337a2c4e7 100644
--- a/test/option/debug-sconscript.py
+++ b/test/option/debug-sconscript.py
@@ -51,6 +51,18 @@ expect = [
     'scons: Exiting %s%sSConstruct' % (wpath, os.sep)
 ]
 test.must_contain_all_lines(test.stdout(), expect)
+
+# Ensure that reutrns with stop are handled properly
+
+test.write('SConstruct', """\
+foo = "bar"
+Return("foo", stop=True)
+print("SConstruct")
+""")
+
+test.run(arguments="--debug=sconscript .")
+test.must_contain_all_lines(test.stdout(), expect)
+
 test.pass_test()
 
 # Local Variables: