ygrader 1.1.21__tar.gz → 1.1.23__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ygrader
-Version: 1.1.21
+Version: 1.1.23
 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.21 → ygrader-1.1.23}/setup.py

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

{ygrader-1.1.21 → ygrader-1.1.23}/ygrader/grades_csv.py

@@ -52,6 +52,12 @@ def match_to_github_url(df_needs_grade, github_csv_path, github_csv_col_name, us
     # Strip whitespace from CSV header names
     df_github.rename(columns=lambda x: x.strip(), inplace=True)
 
+    if "Net ID" not in df_github.columns:
+        error(f"Your github CSV ({github_csv_path}) is missing a 'Net ID' column.")
+
+    # Drop all but Net ID and github URL columns
+    df_github = df_github[["Net ID", github_csv_col_name]]
+
     # Rename appropriate column to github url
     df_github.rename(columns={github_csv_col_name: "github_url"}, inplace=True)
 

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

@@ -18,34 +18,38 @@ def clone_repo(git_path, tag, student_repo_path):
             "already cloned. Re-fetching 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
+        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
 
     print_color(TermColors.BLUE, "Cloning repo, tag =", tag)
-    cmd = [
-        "git",
-        "clone",
-        "--branch",
-        tag,
-        git_path,
-        str(student_repo_path.absolute()),
-    ]
+    if tag:
+        cmd = [
+            "git",
+            "clone",
+            "--branch",
+            tag,
+            git_path,
+            str(student_repo_path.absolute()),
+        ]
+    else:
+        cmd = ["git", "clone", git_path, str(student_repo_path.absolute())]
     try:
         subprocess.run(cmd, check=True)
     except KeyboardInterrupt:

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

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