pypas-cli 0.2.6__tar.gz → 0.3.0__tar.gz

{pypas_cli-0.2.6 → pypas_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypas-cli
-Version: 0.2.6
+Version: 0.3.0
 Summary: Python Practical Assignments
 Author-email: Sergio Delgado Quintero <sdelquin@gmail.com>
 Maintainer-email: Sergio Delgado Quintero <sdelquin@gmail.com>

{pypas_cli-0.2.6 → pypas_cli-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pypas-cli"
-version = "0.2.6"
+version = "0.3.0"
 description = "Python Practical Assignments"
 readme = "README.md"
 requires-python = ">=3.10"

{pypas_cli-0.2.6 → pypas_cli-0.3.0}/src/pypas/lib/exercise.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+import fnmatch
 import os
-import re
 import shutil
 import subprocess
 import tempfile
@@ -57,13 +57,14 @@ class Exercise:
 
     def zip(self, to_tmp_dir: bool = False, verbose: bool = False) -> Path:
         console.info('Compressing exercise contents', cr=verbose)
+        exclude_patterns = self.config.get('exclude_from_zip', [])
         zip_path = tempfile.mkstemp(suffix='.zip')[1] if to_tmp_dir else self.zipname
         zip_file = Path(zip_path)
         with zipfile.ZipFile(zip_file, 'w') as archive:
             for file in self.files:
                 if file.name == self.zipname:
                     continue
-                if re.search(settings.ZIP_IGNORED_PATTERNS_RE, str(file)):
+                if any(fnmatch.fnmatch(str(file), pattern) for pattern in exclude_patterns):
                     if verbose:
                         console.warning(f'Ignoring {file}')
                     continue
@@ -92,10 +93,15 @@ class Exercise:
         os.system(f'{sysutils.get_open_cmd()} docs/README.pdf')
 
     def update(self, src_dir: Path, backup: bool = True):
+        backup_files = self.config.get('backup_on_update', [])
         for file in src_dir.glob('**/*'):
             if file.is_file():
                 rel_file = file.relative_to(src_dir)
-                if backup and rel_file.exists() and str(rel_file) in self.config.get('todo', []):
+                if (
+                    backup
+                    and rel_file.exists()
+                    and any(fnmatch.fnmatch(str(rel_file), pattern) for pattern in backup_files)
+                ):
                     backup_file = rel_file.with_suffix(rel_file.suffix + '.bak')
                     console.debug(f'Backup {rel_file} → {backup_file}')
                     shutil.copy(rel_file, backup_file)

{pypas_cli-0.2.6 → pypas_cli-0.3.0}/src/pypas/main.py

@@ -71,6 +71,7 @@ def update(
     ),
 ):
     """Update exercise."""
+    # Backup patterns follow fnmatch syntax: https://docs.python.org/3/library/fnmatch.html
     config = Config()
     if (exercise := Exercise.from_config()).download(config.get('token')):
         dir = exercise.unzip(to_tmp_dir=True)
@@ -98,6 +99,7 @@ def upgrade():
 @inside_exercise
 def zip(verbose: bool = typer.Option(False, '--verbose', '-v', help='Increase verbosity.')):
     """Compress exercise contents."""
+    # Excluded patterns follow fnmatch syntax: https://docs.python.org/3/library/fnmatch.html
     exercise = Exercise.from_config()
     zipfile = exercise.zip(verbose=verbose)
     size, str_size = sysutils.get_file_size(zipfile)

{pypas_cli-0.2.6 → pypas_cli-0.3.0}/src/pypas/settings.py

@@ -14,9 +14,3 @@ PYPAS_PULL_URLPATH = urljoin(PYPAS_BASE_URL, '/assignments/pull/{item_slug}/')
 EXERCISE_CONFIG_FILE = config('EXERCISE_CONFIG_FILE', default='.pypas.toml')
 MAIN_CONFIG_FILE = config('MAIN_CONFIG_FILE', default=Path.home() / '.pypas.toml', cast=Path)
 LARGE_FILE_SIZE = config('LARGE_FILE_SIZE', default=1024 * 1024, cast=int)
-ZIP_IGNORED_PATTERNS = config(
-    'ZIP_IGNORED_PATTERNS',
-    default=r'cache,node_modules,DS_Store,venv,\.git,\.idea',
-    cast=config.list,
-)
-ZIP_IGNORED_PATTERNS_RE = '|'.join(ZIP_IGNORED_PATTERNS)

{pypas_cli-0.2.6 → pypas_cli-0.3.0}/src/pypas_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypas-cli
-Version: 0.2.6
+Version: 0.3.0
 Summary: Python Practical Assignments
 Author-email: Sergio Delgado Quintero <sdelquin@gmail.com>
 Maintainer-email: Sergio Delgado Quintero <sdelquin@gmail.com>