dlai-grader 1.22.1__tar.gz → 1.22.2__tar.gz

{dlai_grader-1.22.1 → dlai_grader-1.22.2}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: dlai-grader
-Version: 1.22.1
+Version: 1.22.2
 Summary: Grading utilities for DLAI courses
 Home-page: https://github.com/https-deeplearning-ai/grader
 Author: Andres Zarta
 Author-email: andrezb5@gmail.com
-License: MIT License
+License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -13,15 +13,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nbformat>=5.1.3
 Requires-Dist: jupytext>=1.13.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary
 
 # grader
 Automatic grading for DLAI courses. Designed to be compatible with Coursera's grading requirements.

{dlai_grader-1.22.1 → dlai_grader-1.22.2}/dlai_grader/__init__.py

@@ -6,6 +6,6 @@ from . import grading
 from . import types
 
 
-__version__ = "1.22.1"
+__version__ = "1.22.2"
 __author__ = "Andres Zarta"
 __credits__ = "DeepLearning.AI"

{dlai_grader-1.22.1 → dlai_grader-1.22.2}/dlai_grader/io.py

@@ -70,7 +70,7 @@ def uneditable_notebook(path: str) -> None:
         path (str): Path to the notebook.
     """
     nb = read_notebook(path)
-    nb = add_metadata_code_cells_without_pattern(nb, {"editable": False})
+    nb = add_metadata_code_cells_without_pattern(nb, {"editable": False}, ignore_pattern="^# EDITABLE")
     jupytext.write(nb, path)
 
 

{dlai_grader-1.22.1 → dlai_grader-1.22.2}/dlai_grader/notebook.py

@@ -238,27 +238,31 @@ def add_metadata_code_cells_with_pattern(
 
 
 def add_metadata_code_cells_without_pattern(
-    notebook: NotebookNode, metadata: dict, regex_pattern: str = "^# GRADED "
+    notebook: NotebookNode,
+    metadata: dict,
+    match_pattern: str = "^# GRADED ",
+    ignore_pattern: str = None
 ) -> NotebookNode:
-    """Adds metadata to code cells of a notebook that don't match a regexp pattern.
+    """Adds metadata to code cells of a notebook that don't match a regexp pattern and aren't ignored by another pattern.
+    
     Args:
         notebook (NotebookNode): Notebook to filter.
         metadata (dict): The metadata which should be a key-value pair.
-        regex_pattern (str, optional): Pattern to check. Defaults to "w[1-9]_unittest".
+        match_pattern (str, optional): Pattern to check which cells to add metadata to. Defaults to "^# GRADED ".
+        ignore_pattern (str, optional): Pattern to check which cells to ignore. If a cell matches this pattern, it will be skipped.
+        
     Returns:
         NotebookNode: The notebook with the new metadata.
     """
-    filtered_cells = []
-
     for cell in notebook["cells"]:
-        if cell["cell_type"] == "code" and not re.search(regex_pattern, cell["source"]):
-            current_metadata = cell["metadata"]
-            current_metadata.update(metadata)
-            cell["metadata"] = current_metadata
-
-        filtered_cells.append(cell)
-
-    notebook["cells"] = filtered_cells
+        if cell["cell_type"] == "code":
+            if ignore_pattern and re.search(ignore_pattern, cell["source"]):
+                continue
+            
+            if not re.search(match_pattern, cell["source"]):
+                current_metadata = cell.get("metadata", {})
+                current_metadata.update(metadata)
+                cell["metadata"] = current_metadata
 
     return notebook
 

{dlai_grader-1.22.1 → dlai_grader-1.22.2}/dlai_grader.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: dlai-grader
-Version: 1.22.1
+Version: 1.22.2
 Summary: Grading utilities for DLAI courses
 Home-page: https://github.com/https-deeplearning-ai/grader
 Author: Andres Zarta
 Author-email: andrezb5@gmail.com
-License: MIT License
+License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -13,15 +13,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nbformat>=5.1.3
 Requires-Dist: jupytext>=1.13.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary
 
 # grader
 Automatic grading for DLAI courses. Designed to be compatible with Coursera's grading requirements.

{dlai_grader-1.22.1 → dlai_grader-1.22.2}/setup.py

@@ -5,14 +5,15 @@ with open("README.md", "r") as f:
 
 setup(
     name="dlai-grader",
-    version="1.22.1",
+    version="1.22.2",
     description="Grading utilities for DLAI courses",
     url="https://github.com/https-deeplearning-ai/grader",
     author="Andres Zarta",
     author_email="andrezb5@gmail.com",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    license="MIT License",
+    license="MIT",
+    license_files=["LICENSE"],
     packages=find_packages(),
     package_data={"dlai_grader": ["py.typed"]},
     entry_points={