makeapp 2.2.0__tar.gz → 2.3.0__tar.gz

{makeapp-2.2.0 → makeapp-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makeapp
-Version: 2.2.0
+Version: 2.3.0
 Summary: Simplifies routine Python application development processes.
 Project-URL: Homepage, https://github.com/idlesign/makeapp
 Project-URL: Documentation, https://makeapp.readthedocs.io/

makeapp-2.3.0/src/makeapp/__init__.py

@@ -0,0 +1,3 @@
+
+VERSION = '2.3.0'
+"""Application version number tuple."""

{makeapp-2.2.0 → makeapp-2.3.0}/src/makeapp/appmaker.py

@@ -113,7 +113,7 @@ class AppMaker:
 
         # Support for user-supplied template directories.
         for template in templates_to_use or []:
-            if '/' in template:
+            if os.sep in template:
                 parent = str(Path(template).parent)
                 if parent not in search_paths:
                     search_paths.append(parent)
@@ -302,6 +302,7 @@ class AppMaker:
         :param remote_push: Whether to push to remote.
 
         """
+        dest = os.path.abspath(dest)
         self.logger.info(f'Application target path: {dest}')
 
         # Make remote available for hooks.

{makeapp-2.2.0 → makeapp-2.3.0}/src/makeapp/apptemplate.py

@@ -120,12 +120,12 @@ class AppTemplate:
 
                 full_path = os.path.join(path, fname)
 
-                rel_path = full_path.replace(templates_path, '').lstrip('/')
+                rel_path = os.path.relpath(full_path, templates_path)
 
                 template_file = TemplateFile(
                     template=self,
                     path_full=full_path,
-                    path_rel=rel_path,
+                    path_rel=rel_path.replace(os.sep, '/'),
                 )
 
                 rel_path = rel_path.replace(maker.package_dir_marker, maker.settings['package_name'])
@@ -174,9 +174,9 @@ class AppTemplate:
 
         """
         for supposed_path in search_paths:
-            if '/' in supposed_path and os.path.exists(supposed_path):
+            if os.sep in supposed_path and os.path.exists(supposed_path):
                 path = str(os.path.abspath(supposed_path))
-                return path.split('/')[-1], path
+                return path.split(os.sep)[-1], path
 
         raise AppMakerException(
             f"Unable to find application template {name_or_path}. "
@@ -221,7 +221,7 @@ class TemplateFile:
 
             if os.path.exists(path_full):
                 # Check parent file exists in template.
-                paths.append(os.path.join(parent.name, path_rel))
+                paths.append(f'{parent.name}/{path_rel}')
 
             if parent.is_default:
                 break

{makeapp-2.2.0 → makeapp-2.3.0}/src/makeapp/cli.py

@@ -248,8 +248,9 @@ def tests(debug, only):
 
     for status, color, err in ((key_ok, 'green', False), (key_fail, 'red', True)):
         if items := stats[status]:
-            items = "\n  ".join(items)
-            click.secho(f'Tests {status}:\n  {items}', err=err, fg=color)
+            total_items = len(items)
+            items = ' '.join(items)
+            click.secho(f'Tests {status} ({total_items}):\n  {items}', err=err, fg=color)
 
     click.secho('Done', fg='green')
 

{makeapp-2.2.0 → makeapp-2.3.0}/src/makeapp/helpers/tests.py

@@ -49,11 +49,17 @@ class TestsHelper:
         values = matrix.values()
         combinations = []
 
+        def norm(val) -> float | str:
+            try:
+                return float(val)
+            except (ValueError, TypeError):
+                return f'{val}'
+
         for combined in product(*values):
             combination = dict(zip(keys, combined, strict=False))
             is_excluded = False
             for exclusion in exclusions:
-                if all(f'{combination.get(key)}' == f'{val}' for key, val in exclusion.items()):
+                if all(f'{norm(combination.get(key))}' == f'{norm(val)}' for key, val in exclusion.items()):
                     is_excluded = True
                     break
 

{makeapp-2.2.0 → makeapp-2.3.0}/src/makeapp/helpers/vcs.py

@@ -110,7 +110,11 @@ class VcsHelper:
         :param message: Commit description.
 
         """
-        self.run_command("commit -m '%s'" % message.replace("'", "''"))
+        with NamedTemporaryFile() as f:
+            f.write(message.encode())
+            f.flush()
+
+            self.run_command(f'commit -F "{f.name}"')
 
     def get_remotes(self):
         """Returns a list of remotes."""

{makeapp-2.2.0 → makeapp-2.3.0}/src/makeapp/utils.py

@@ -87,13 +87,10 @@ def check_command(command: str, *, hint: str):
     :param hint:
 
     """
-    try:
-        run_command(f'type {command}')
-
-    except CommandError as e:
+    if shutil.which(command) is None:
         raise CommandError(
             f"Failed to execute '{command}' command. "
-            f"Check {hint} is installed and available.") from e
+            f"Check {hint} is installed and available.")
 
 
 def run_command(command: str, *, err_msg: str = '', env: dict | None = None, capture: bool = True) -> list[str]:
@@ -187,4 +184,8 @@ class Uv:
 
     @classmethod
     def install(cls):
-        return run_command('curl -LsSf https://astral.sh/uv/install.sh | sh', capture=False)
+        if sys.platform == 'win32':
+            cmd = 'powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"'
+        else:
+            cmd = 'curl -LsSf https://astral.sh/uv/install.sh | sh'
+        return run_command(cmd, capture=False)

makeapp-2.2.0/src/makeapp/__init__.py

@@ -1,3 +0,0 @@
-
-VERSION = '2.2.0'
-"""Application version number tuple."""