ygrader 1.1.23__tar.gz → 1.1.25__tar.gz

{ygrader-1.1.23/ygrader.egg-info → ygrader-1.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ygrader
-Version: 1.1.23
+Version: 1.1.25
 Summary: Grading scripts used in BYU's Electrical and Computer Engineering Department
 Home-page: https://github.com/byu-cpe/ygrader
 Author: Jeff Goeders

{ygrader-1.1.23 → ygrader-1.1.25}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 setup(
     name="ygrader",
     packages=["ygrader"],
-    version="1.1.23",
+    version="1.1.25",
     description="Grading scripts used in BYU's Electrical and Computer Engineering Department",
     author="Jeff Goeders",
     author_email="jeff.goeders@gmail.com",

{ygrader-1.1.23 → ygrader-1.1.25}/ygrader/student_repos.py

@@ -18,25 +18,35 @@ def clone_repo(git_path, tag, student_repo_path):
             "already cloned. Re-fetching tag",
         )
 
-        if tag:
-            # Fetch
-            cmd = ["git", "fetch", "--tags", "-f"]
-            try:
-                subprocess.run(cmd, cwd=student_repo_path, check=True)
-            except subprocess.CalledProcessError:
-                print_color(TermColors.RED, "git fetch failed")
-                return False
-
-            # Checkout tag
-            if tag not in ("master", "main"):
-                tag = "tags/" + tag
-            cmd = ["git", "checkout", tag, "-f"]
-            try:
-                subprocess.run(cmd, cwd=student_repo_path, check=True)
-            except subprocess.CalledProcessError:
-                print_color(TermColors.RED, "git checkout of tag failed")
-                return False
-            return True
+        # Fetch
+        cmd = ["git", "fetch", "--tags", "-f"]
+        try:
+            subprocess.run(cmd, cwd=student_repo_path, check=True)
+        except subprocess.CalledProcessError:
+            print_color(TermColors.RED, "git fetch failed")
+            return False
+
+        # Checkout tag
+        if tag is None:
+            # Get the default branch
+            stdout = subprocess.run(
+                ["git", "symbolic-ref", "refs/remotes/origin/HEAD", "--short"],
+                cwd=student_repo_path,
+                check=True,
+                capture_output=True,
+                universal_newlines=True,
+            ).stdout
+            tag = stdout.split("/")[1].strip()
+
+        if tag not in ("master", "main"):
+            tag = "tags/" + tag
+        cmd = ["git", "checkout", tag, "-f"]
+        try:
+            subprocess.run(cmd, cwd=student_repo_path, check=True)
+        except subprocess.CalledProcessError:
+            print_color(TermColors.RED, "git checkout of tag failed")
+            return False
+        return True
 
     print_color(TermColors.BLUE, "Cloning repo, tag =", tag)
     if tag:

{ygrader-1.1.23 → ygrader-1.1.25/ygrader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ygrader
-Version: 1.1.23
+Version: 1.1.25
 Summary: Grading scripts used in BYU's Electrical and Computer Engineering Department
 Home-page: https://github.com/byu-cpe/ygrader
 Author: Jeff Goeders