ygrader 2.6.5__tar.gz → 2.6.6__tar.gz

{ygrader-2.6.5/ygrader.egg-info → ygrader-2.6.6}/PKG-INFO

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

{ygrader-2.6.5 → ygrader-2.6.6}/setup.py

@@ -4,7 +4,7 @@ setup(
     name="ygrader",
     packages=["ygrader"],
     package_data={"ygrader": ["*.ahk"]},
-    version="2.6.5",
+    version="2.6.6",
     description="Grading scripts used in BYU's Electrical and Computer Engineering Department",
     author="Jeff Goeders",
     author_email="jeff.goeders@gmail.com",

{ygrader-2.6.5 → ygrader-2.6.6}/ygrader/feedback.py

@@ -293,11 +293,19 @@ def assemble_grades(
 
             if items_graded and items_not_graded:
                 print_color(
-                    TermColors.YELLOW,
+                    TermColors.RED,
                     f"Partial grade: {net_id} graded for [{', '.join(items_graded)}] "
                     f"but NOT [{', '.join(items_not_graded)}]",
                 )
 
+            # Check if student has no grades at all
+            student_graded = len(items_graded) > 0
+            if not student_graded:
+                print_color(
+                    TermColors.YELLOW,
+                    f"No grades: {net_id} has no grades, receiving 0",
+                )
+
             # Get submit info for this student
             _, effective_due_date, submitted_datetime = (
                 _get_student_key_and_submit_info(
@@ -353,6 +361,7 @@ def assemble_grades(
                     late_penalty_callback=late_penalty_callback,
                     due_date=due_date,
                     due_date_exceptions=due_date_exceptions,
+                    student_graded=student_graded,
                 )
 
                 filename = (
@@ -391,6 +400,7 @@ def _generate_student_feedback(
     late_penalty_callback: Optional[LatePenaltyCallback] = None,
     due_date: Optional[datetime.datetime] = None,
     due_date_exceptions: Optional[Dict[str, datetime.datetime]] = None,
+    student_graded: bool = True,
 ) -> str:
     """Generate the feedback text content for a single student.
 
@@ -401,6 +411,7 @@ def _generate_student_feedback(
         late_penalty_callback: Optional callback for calculating late penalty.
         due_date: The default due date for the assignment.
         due_date_exceptions: Mapping from net_id to exception due date.
+        student_graded: Whether the student was graded at all (False if no submission).
 
     Returns:
         The formatted feedback text.
@@ -517,6 +528,12 @@ def _generate_student_feedback(
         lines.append(
             f"{late_label:<{item_col_width}} {-late_penalty_points:>{score_col_width}.1f}"
         )
+    elif not student_graded:
+        # Student was never graded (no submission)
+        final_score = score_before_late
+        lines.append(
+            f"{'Late Penalty:':<{item_col_width}} {'No Submission':>{score_col_width}}"
+        )
     else:
         final_score = score_before_late
         lines.append(

{ygrader-2.6.5 → ygrader-2.6.6}/ygrader/grader.py

@@ -896,7 +896,8 @@ class Grader:
         student_work_path.mkdir(parents=True, exist_ok=True)
 
         # Clone student repo
-        print("Student repo url: " + row["github_url"], file=output)
+        https_url = student_repos.convert_github_url_format(row["github_url"], to_https=True)
+        print("Student repo url: " + https_url, file=output)
         if not student_repos.clone_repo(
             row["github_url"], self.github_tag, student_work_path, output=output
         ):

{ygrader-2.6.5 → ygrader-2.6.6}/ygrader/grading_item.py

@@ -144,43 +144,20 @@ class GradeItem:
                 )
 
             # Verify workflow hash if configured
-            if self.grader.workflow_hash is not None:
-                student_code_path = callback_args.get("student_code_path")
-                if student_code_path:
-                    workflow_file_path = (
-                        student_code_path / ".github" / "workflows" / "submission.yml"
+            workflow_errors = []
+            student_code_path = callback_args.get("student_code_path")
+            if self.grader.workflow_hash is not None and student_code_path:
+                workflow_file_path = (
+                    student_code_path / ".github" / "workflows" / "submission.yml"
+                )
+                try:
+                    verify_workflow_hash(
+                        workflow_file_path, self.grader.workflow_hash
                     )
-                    try:
-                        verify_workflow_hash(
-                            workflow_file_path, self.grader.workflow_hash
-                        )
-                    except WorkflowHashError as e:
-                        print("")
-                        print_color(TermColors.RED, "=" * 70)
-                        print_color(
-                            TermColors.RED,
-                            "WARNING: WORKFLOW FILE VERIFICATION FAILED!",
-                        )
-                        print_color(TermColors.RED, "=" * 70)
-                        print_color(TermColors.RED, str(e))
-                        print_color(TermColors.RED, "")
-                        print_color(
-                            TermColors.RED,
-                            "This student may have modified the GitHub workflow system.",
-                        )
-                        print_color(
-                            TermColors.RED, "The submission date CANNOT be guaranteed."
-                        )
-                        print_color(TermColors.RED, "")
-                        print_color(
-                            TermColors.RED,
-                            "Please contact the instructor before grading this student.",
-                        )
-                        print_color(TermColors.RED, "=" * 70)
-                        print("")
+                except WorkflowHashError as e:
+                    workflow_errors.append(f"Workflow hash mismatch: {e}")
 
             # Display submission date if available and store for later late calculation
-            student_code_path = callback_args.get("student_code_path")
             # Store submission time but don't save yet - will be saved only after successful grading
             pending_submit_time = None
             if student_code_path:
@@ -188,10 +165,12 @@ class GradeItem:
                 if submission_date_path.is_file():
                     try:
                         with open(submission_date_path, encoding="utf-8") as f:
-                            submission_time = datetime.datetime.strptime(
-                                f.read().strip(),
-                                "%a %b %d %H:%M:%S %Z %Y",
-                            )
+                            date_str = f.read().strip()
+                        # Expected format from workflow: "Sun Jan 12 21:51:14 MST 2026"
+                        submission_time = datetime.datetime.strptime(
+                            date_str,
+                            "%a %b %d %H:%M:%S %Z %Y",
+                        )
                         print_color(
                             TermColors.BLUE,
                             f"Submitted: {submission_time.strftime('%Y-%m-%d %H:%M:%S')}",
@@ -199,10 +178,46 @@ class GradeItem:
                         # Store as ISO format for later late calculation
                         pending_submit_time = submission_time.isoformat()
                     except (ValueError, IOError) as e:
-                        print_color(
-                            TermColors.YELLOW,
-                            f"Could not parse submission date: {e}",
-                        )
+                        workflow_errors.append(f"Submission date parsing failed: {e}")
+
+            # Print unified warning if any workflow-related errors occurred
+            if workflow_errors:
+                print("")
+                print_color(TermColors.RED, "=" * 70)
+                print_color(
+                    TermColors.RED,
+                    "WARNING: WORKFLOW VERIFICATION FAILED!",
+                )
+                print_color(TermColors.RED, "=" * 70)
+                for err in workflow_errors:
+                    print_color(TermColors.RED, f"  - {err}")
+                print_color(TermColors.RED, "")
+                print_color(
+                    TermColors.RED,
+                    "This student may have modified the GitHub workflow system.",
+                )
+                print_color(
+                    TermColors.RED, "The submission date CANNOT be guaranteed."
+                )
+                print_color(TermColors.RED, "")
+                print_color(
+                    TermColors.RED,
+                    "Please contact the instructor before grading this student.",
+                )
+                print_color(TermColors.RED, "=" * 70)
+                print("")
+
+                # Ask for confirmation before grading
+                while True:
+                    response = input(
+                        "Do you want to grade this student anyway? [y/n]: "
+                    ).strip().lower()
+                    if response in ("y", "yes"):
+                        break
+                    if response in ("n", "no"):
+                        print_color(TermColors.BLUE, "Skipping student")
+                        return False
+                    print("Please enter 'y' or 'n'")
 
             # Process callback result:
             # - None: interactive mode (prompt for deductions)

{ygrader-2.6.5 → ygrader-2.6.6/ygrader.egg-info}/PKG-INFO

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