move project code names to a separate shared projcode module and revert absolute imports from last commit until we figure out how to make them work with python 2 and our project layout

jonasbardino · jonasbardino · commit c3ad080ba444 · 2020-07-30T10:55:19.000Z
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@4894 b75ad72c-e7d7-11dd-a971-7dbc132099af
diff --git a/makerelease.py b/makerelease.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
+# --- BEGIN_HEADER ---
+#
 # makerelease - a simple helper to create a MiG project code release.
-# Copyright (C) 2009  Jonas Bardino
+# Copyright (C) 2009-2020  Jonas Bardino
 #
 # This file is part of MiG.
 #
@@ -18,9 +20,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# --- END_HEADER ---
+#
 
 """Pack relevant parts of the code in a versioned tarball"""
+
 from __future__ import print_function
 
 import os
@@ -29,7 +36,8 @@
 
 if len(sys.argv) < 2:
     print('Usage: %s VERSION TARGET' % sys.argv[0])
-    print('Make a release tarball of all code in TARGET and stamp it as VERSION')
+    print(
+        'Make a release tarball of all code in TARGET and stamp it as VERSION')
     sys.exit(1)
 
 version = sys.argv[1]
@@ -60,10 +68,9 @@
             if name.startswith(tar_path):
                 continue
             path = os.path.normpath(os.path.join(root, name))
-            rel_path = path.replace(target+os.sep, '')
+            rel_path = path.replace(target + os.sep, '')
             archive_path = os.path.join(archive_base, rel_path)
             print('Adding %s' % archive_path)
             tar_ball.add(rel_path, archive_path, recursive=False)
     tar_ball.close()
     print('Wrote release of %s in %s' % (target, tar_path))
-
diff --git a/mig/addheader.py b/mig/addheader.py
@@ -4,7 +4,7 @@
 # --- BEGIN_HEADER ---
 #
 # addheader - add license header to all code modules.
-# Copyright (C) 2009-2017  Jonas Bardino
+# Copyright (C) 2009-2020  Jonas Bardino
 #
 # This file is part of MiG.
 #
@@ -28,14 +28,13 @@
 
 """Search code tree and add the required header to all python modules"""
 from __future__ import print_function
-from __future__ import absolute_import
 
 import datetime
 import fnmatch
 import os
 import sys
 
-from .codegrep import py_code_files, sh_code_files, js_code_files
+from shared.projcode import py_code_files, sh_code_files, js_code_files
 
 # Modify these to fit actual project
 proj_vars = {}
@@ -70,17 +69,18 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # %(project_name)s is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 # USA."""
 
+
 def check_header(path, var_dict, preamble_size=4096):
     """Check if path already has a credible license header. Only looks inside
     the first preamble_size bytes of the file.
@@ -89,11 +89,12 @@ def check_header(path, var_dict, preamble_size=4096):
     module_preamble = module_fd.read(4096)
     module_fd.close()
     if begin_marker in module_preamble or \
-           proj_vars['authors'] in module_preamble:
+            proj_vars['authors'] in module_preamble:
         return True
     else:
         return False
-    
+
+
 def add_header(path, var_dict, explicit_border=True, block_wrap=False):
     """Add the required copyright and license header to module in path.
     The optional explicit_border argument can be set to wrap the license
@@ -127,7 +128,7 @@ def add_header(path, var_dict, explicit_border=True, block_wrap=False):
         if module_lines and module_lines[0].startswith("#!"):
             module_header.append(module_lines[0].strip())
             module_lines = module_lines[1:]
-        
+
     if var_dict['module_encoding']:
         module_header.append(enc)
         if module_lines and module_lines[0].startswith("# -*- coding"):
@@ -149,12 +150,11 @@ def add_header(path, var_dict, explicit_border=True, block_wrap=False):
 %s
 */
 """ % lic
-        
+
     module_header.append(lic)
     module_text = '\n'.join(module_header) % var_dict + '\n'\
-         + ''.join(module_lines)
+        + ''.join(module_lines)
 
-        
     module_fd = open(path, 'w')
     module_fd.write(module_text)
     module_fd.close()
@@ -170,7 +170,7 @@ def add_header(path, var_dict, explicit_border=True, block_wrap=False):
     for (root, dirs, files) in os.walk(target):
 
         # skip all dot dirs - they are from repos etc and _not_ jobs
-    
+
         if root.find(os.sep + '.') != -1:
             continue
         for name in files:
@@ -183,11 +183,11 @@ def add_header(path, var_dict, explicit_border=True, block_wrap=False):
                     needs_block = True
                 else:
                     needs_block = False
-                    
+
                 pattern = os.path.join(mig_code_base, pattern)
 
                 # print "Testing %s against %s" % (src_path, pattern)
-    
+
                 if src_path == pattern or fnmatch.fnmatch(src_path, pattern):
                     print('Matched %s against %s' % (src_path, pattern))
                     proj_vars['module_name'] = name.replace('.py', '')
diff --git a/mig/bugweed.py b/mig/bugweed.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
+# --- BEGIN_HEADER ---
+#
 # bugweed - a simple helper to locate simple error in the project code.
-# Copyright (C) 2003-2015  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2020  The MiG Project lead by Brian Vinter
 #
 # This file is part of MiG.
 #
@@ -18,17 +20,20 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# --- END_HEADER ---
+#
 
 """Grep for obvious errors in pylint output for all code"""
 from __future__ import print_function
-from __future__ import absolute_import
 
 import glob
 import sys
 
-from .codegrep import py_code_files
-from .shared.safeeval import subprocess_call
+from shared.projcode import py_code_files
+from shared.safeeval import subprocess_call
 
 if '__main__' == __name__:
     if len(sys.argv) != 1:
@@ -44,6 +49,6 @@
     print("Bug weeding command: %s" % command)
     print("*** Not all lines reported are necessarily errors ***")
     print()
-    #subprocess_call(command, only_sanitized_variables=True)
-    # NOTE: we use command list to avoid shell requirement    
+    # subprocess_call(command, only_sanitized_variables=True)
+    # NOTE: we use command list to avoid shell requirement
     subprocess_call(command_list)
diff --git a/mig/codegrep.py b/mig/codegrep.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
+# --- BEGIN_HEADER ---
+#
 # codegrep - a simple helper to locate strings in the project code.
-# Copyright (C) 2003-2018  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2020  The MiG Project lead by Brian Vinter
 #
 # This file is part of MiG.
 #
@@ -18,75 +20,22 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# --- END_HEADER ---
+#
 
 """Grep for a regular expression in all code files"""
+
 from __future__ import print_function
-from __future__ import absolute_import
 
 import glob
 import sys
 
-from .shared.safeeval import subprocess_call
-
-# Ignore backup and dot files in wild card match
-plain = '[a-zA-Z0-9]*.py'
-py_code_files = [
-    '%s' % plain,
-    'cgi-bin/%s' % plain,
-    'cgi-sid/%s' % plain,
-    'wsgi-bin/%s' % plain,
-    'install/%s' % plain,
-    'migfs-fuse/%s' % plain,
-    'resource/bin/%s' % plain,
-    'resource/image-scripts/%s' % plain,
-    'resource/keepalive-scripts/%s' % plain,
-    'server/%s' % plain,
-    'shared/%s' % plain,
-    'shared/functionality/%s' % plain,
-    'shared/distos/%s' % plain,
-    'simulation/%s' % plain,
-    'user/%s' % plain,
-    'vm-proxy/%s' % plain,
-    'webserver/%s' % plain,
-    'wsgi-bin/%s' % plain,
-]
-py_code_files += ['cgi-sid/%s' % name for name in ['requestnewjob',
-                                                   'putrespgid']]
+from shared.projcode import code_files
+from shared.safeeval import subprocess_call
 
-py_code_files += ['cgi-bin/%s' % name for name in [
-    'listdir',
-    'mkdir',
-    'put',
-    'remove',
-    'rename',
-    'rmdir',
-    'stat',
-    'walk',
-    'getrespgid',
-]]
-sh_code_files = [
-    'resource/frontend_script.sh',
-    'resource/master_node_script.sh',
-    'resource/leader_node_script.sh',
-    'resource/dummy_node_script.sh',
-]
-js_code_files = [
-    'images/js/jquery.ajaxhelpers.js',
-    'images/js/jquery.confirm.js',
-    'images/js/jquery.filemanager.js',
-    'images/js/jquery.jobmanager.js',
-    'images/js/jquery.migtools.js',
-    'images/js/jquery.prettyprint.js',
-    'images/js/preview-caman.js',
-    'images/js/preview.js',
-    'images/js/preview-paraview.js',
-    'assets/js/V2/ui-dynamic.js',
-    'assets/js/V3/ui-dynamic.js',
-    'assets/js/V3/ui-global.js',
-    'assets/js/V3/ui-extra.js',
-]
-code_files = py_code_files + sh_code_files + js_code_files
 
 if '__main__' == __name__:
     if len(sys.argv) < 2:
diff --git a/mig/edpickle.py b/mig/edpickle.py
@@ -1,12 +1,10 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-
 #
 # --- BEGIN_HEADER ---
 #
-#
 # edpickle - a simple pickled object editor.
-# Copyright (C) 2003-2018  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2020  The MiG Project lead by Brian Vinter
 #
 # This file is part of MiG.
 #
@@ -29,13 +27,13 @@
 #
 
 """Edit pickled objects on disk"""
+
 from __future__ import print_function
-from __future__ import absolute_import
 
 import os
 import sys
 
-from .shared.serial import pickle
+from shared.serial import pickle
 
 
 if len(sys.argv) < 2:
diff --git a/mig/shared/projcode.py b/mig/shared/projcode.py

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`#!/usr/bin/python`
`2`	`2`	`# -- coding: utf-8 --`
`3`		`-`
`4`	`3`	`#`
`5`	`4`	`# --- BEGIN_HEADER ---`
`6`	`5`	`#`
`7`		`-#`
`8`	`6`	`# edpickle - a simple pickled object editor.`
`9`		`-# Copyright (C) 2003-2018 The MiG Project lead by Brian Vinter`
	`7`	`+# Copyright (C) 2003-2020 The MiG Project lead by Brian Vinter`
`10`	`8`	`#`
`11`	`9`	`# This file is part of MiG.`
`12`	`10`	`#`
`@@ -29,13 +27,13 @@`
`29`	`27`	`#`
`30`	`28`
`31`	`29`	`"""Edit pickled objects on disk"""`
	`30`	`+`
`32`	`31`	`from __future__ import print_function`
`33`		`-from __future__ import absolute_import`
`34`	`32`
`35`	`33`	`import os`
`36`	`34`	`import sys`
`37`	`35`
`38`		`-from .shared.serial import pickle`
	`36`	`+from shared.serial import pickle`
`39`	`37`
`40`	`38`
`41`	`39`	`if len(sys.argv) < 2:`