From bb0a6f453dfdd72d4bfda33c14f790b4c6623685 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Tue, 30 Jun 2020 16:08:23 -0700
Subject: clean up sider/flake8 warnings

---
 SCons/Utilities/ConfigureCache.py | 3 ---
 SCons/Utilities/sconsign.py       | 2 --
 SCons/__init__.py                 | 8 ++++----
 site_scons/site_init.py           | 1 +
 site_scons/update_build_info.py   | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/SCons/Utilities/ConfigureCache.py b/SCons/Utilities/ConfigureCache.py
index 0c6dbe3..08faeae 100644
--- a/SCons/Utilities/ConfigureCache.py
+++ b/SCons/Utilities/ConfigureCache.py
@@ -36,9 +36,6 @@ import glob
 import json
 import os
 
-from SCons import __version__, __build__, __buildsys__, __date__, __developer__
-
-
 def rearrange_cache_entries(current_prefix_len, new_prefix_len):
     """Move cache files if prefix length changed.
 
diff --git a/SCons/Utilities/sconsign.py b/SCons/Utilities/sconsign.py
index d2831e6..76a8233 100644
--- a/SCons/Utilities/sconsign.py
+++ b/SCons/Utilities/sconsign.py
@@ -23,8 +23,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from SCons import __version__, __build__, __buildsys__, __date__, __developer__
-
 import getopt
 import os
 import sys
diff --git a/SCons/__init__.py b/SCons/__init__.py
index fad85c2..8520fe0 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
 __version__="3.9.9a996"
 __copyright__="Copyright (c) 2001 - 2020 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="2020-06-30 22:00:50"
+__date__="2020-06-30 23:00:35"
 __buildsys__="ProDog2020"
-__revision__="a61be899bd0c0e5038bcbf361873f494a0e0dd70"
-__build__="a61be899bd0c0e5038bcbf361873f494a0e0dd70"
+__revision__="8e18d0c324c2605936198e64d349c89082b1463d"
+__build__="8e18d0c324c2605936198e64d349c89082b1463d"
 # make sure compatibility is always in place
-import SCons.compat
\ No newline at end of file
+import SCons.compat # noqa
\ No newline at end of file
diff --git a/site_scons/site_init.py b/site_scons/site_init.py
index d55a9f8..336cad6 100644
--- a/site_scons/site_init.py
+++ b/site_scons/site_init.py
@@ -1,3 +1,4 @@
+# flake8: noqa
 import os.path
 
 from SConsRevision import SCons_revision
diff --git a/site_scons/update_build_info.py b/site_scons/update_build_info.py
index 2007245..b9d565a 100644
--- a/site_scons/update_build_info.py
+++ b/site_scons/update_build_info.py
@@ -11,6 +11,6 @@ def update_init_file(env):
     si = env.Textfile('#SCons/__init__.py',
                       ["%s=\"%s\"" % (k, v) for k, v in substitutions.items()] +
                       ['# make sure compatibility is always in place',
-                       'import SCons.compat'],
+                       'import SCons.compat # noqa'],
                       )
     env.Precious(si)
-- 
cgit v0.12