Merge pull request #78 from ESMCI/py38_compatibility_better_warnings

py 3.8 compatibility

Author: jedwards4b

git_fleximod/cli.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 import argparse, os, sys
-from importlib.resources import files
 from git_fleximod import utils
 
 __version__ = "1.0.1"
@@ -12,8 +11,8 @@ def print_help(self, file=None):
 
         # Then append the contents of README.md
         candidate_paths = [
-            os.path.join(sys.prefix, "share", "your-package", "README.md"),
-            os.path.join(os.path.dirname(__file__), "..", "README.md")  # fallback for dev
+            Path(sys.prefix) / "share" / "git_fleximod" / "README.md",
+            Path(__file__).resolve().parent.parent / "README.md",  # fallback for dev
         ]
         for path in candidate_paths:
             if os.path.exists(path):
@@ -25,26 +24,21 @@ def print_help(self, file=None):
 def find_root_dir(filename=".gitmodules"):
     """ finds the highest directory in tree
     which contains a file called filename """
-    try:
-        root = utils.execute_subprocess(["git","rev-parse", "--show-toplevel"],
-                                        output_to_caller=True ).rstrip()
-    except:
-        d = Path.cwd()
-        root = Path(d.root)
-        dirlist = []
-        dl = d
-        while dl != root:
-            dirlist.append(dl)
-            dl = dl.parent
-        dirlist.append(root)
-        dirlist.reverse()
-
-        for dl in dirlist:
-            attempt = dl / filename
-            if attempt.is_file():
-                return str(dl)
-        return None
-    return Path(root)
+    d = Path.cwd()
+    root = Path(d.root)
+    dirlist = []
+    dl = d
+    while dl != root:
+        dirlist.append(dl)
+        dl = dl.parent
+    dirlist.append(root)
+    dirlist.reverse()
+
+    for dl in dirlist:
+        attempt = dl / filename
+        if attempt.is_file():
+            return str(dl)
+    return None
 
 def get_parser():
     description = """

git_fleximod/gitinterface.py

@@ -60,7 +60,14 @@ def _git_operation_command(self, operation, args):
 
     # pylint: disable=unused-argument
     def git_operation(self, operation, *args, **kwargs):
-        command = self._git_operation_command(operation, args)
+        newargs = []
+        for a in args:
+            # Do not use ssh interface
+            if isinstance(a, str):
+                a = a.replace("[email protected]:", "https://github.com/")
+            newargs.append(a)
+
+        command = self._git_command(operation, *newargs)
         if isinstance(command, list):
             try:
                 status, output = utils.execute_subprocess(command, status_to_caller=True, output_to_caller=True)

git_fleximod/submodule.py

@@ -119,7 +119,6 @@ def status(self):
                                 atag = atag[:-1]
                             if atag == self.fxtag:
                                 break
-                
                 recurse = False
                 if rurl != self.url:
                     remote = self._add_remote(git)