pypas-cli 0.4.0__tar.gz → 0.4.2__tar.gz

{pypas_cli-0.4.0/src/pypas_cli.egg-info → pypas_cli-0.4.2}/PKG-INFO

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

{pypas_cli-0.4.0 → pypas_cli-0.4.2}/pyproject.toml

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

{pypas_cli-0.4.0 → pypas_cli-0.4.2}/src/pypas/lib/config.py

@@ -57,5 +57,9 @@ class Config:
         return None
 
     @staticmethod
-    def local_config_exists(config_file: str = settings.EXERCISE_CONFIG_FILE) -> bool:
-        return Path(config_file).exists()
+    def local_config_exists(
+        config_file: str = settings.EXERCISE_CONFIG_FILE, ignore_main_config: bool = False
+    ) -> bool:
+        return Path(config_file).exists() and (
+            ignore_main_config or Path('.').resolve() != settings.MAIN_CONFIG_FILE.parent.resolve()
+        )

{pypas_cli-0.4.0 → pypas_cli-0.4.2}/src/pypas/lib/exercise.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import filecmp
 import os
 import shutil
 import subprocess
@@ -102,7 +103,11 @@ class Exercise:
             for filename in files:
                 file = Path(dirpath) / filename
                 rel_file = file.relative_to(src_dir)
-                if backup and rel_file.exists() and backup_files.match_file(str(rel_file)):
+                if (
+                    backup
+                    and backup_files.match_file(str(rel_file))
+                    and not filecmp.cmp(rel_file, file, shallow=False)
+                ):
                     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.4.0 → pypas_cli-0.4.2}/src/pypas/main.py

@@ -92,7 +92,6 @@ def auth(token: str = typer.Argument(help='Access token')):
 
 
 @app.command()
-@check_version
 def upgrade():
     """Upgrade pypas-cli from PyPI."""
     if sysutils.upgrade_pypas():

{pypas_cli-0.4.0 → pypas_cli-0.4.2/src/pypas_cli.egg-info}/PKG-INFO

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