makeapp 2.1.0__tar.gz → 2.3.0__tar.gz

{makeapp-2.1.0 → makeapp-2.3.0}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2025, Igor `idle sign` Starikov
+Copyright (c) 2013-2026, Igor `idle sign` Starikov
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makeapp
-Version: 2.1.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/
@@ -8,9 +8,10 @@ Author-email: Igor Starikov <idlesign@yandex.ru>
 License-Expression: BSD-3-Clause
 License-File: LICENSE
 Keywords: development,scaffolding
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: click
 Requires-Dist: jinja2~=3.1
+Requires-Dist: pyyaml
 Requires-Dist: requests
 Description-Content-Type: text/markdown
 
@@ -37,6 +38,7 @@ https://github.com/idlesign/makeapp
 * Easily bootstrap your development environment.
 * Build and local serve the docs.
 * Run code styling/linting.
+* Run tests in different environments.
 
 ## Application scaffolding
 
@@ -111,7 +113,6 @@ Apply code style with `style` command:
 ma style
 ```
 
-
 ## Build/serve docs
 
 Use `docs` command:
@@ -120,6 +121,16 @@ Use `docs` command:
 ma docs
 ```
 
+
+## Run tests
+
+Use `tests` command:
+
+``` bash
+ma tests
+```
+
+
 ## Documentation
 
 https://makeapp.readthedocs.io/

{makeapp-2.1.0 → makeapp-2.3.0}/README.md

@@ -21,6 +21,7 @@ https://github.com/idlesign/makeapp
 * Easily bootstrap your development environment.
 * Build and local serve the docs.
 * Run code styling/linting.
+* Run tests in different environments.
 
 ## Application scaffolding
 
@@ -95,7 +96,6 @@ Apply code style with `style` command:
 ma style
 ```
 
-
 ## Build/serve docs
 
 Use `docs` command:
@@ -104,6 +104,16 @@ Use `docs` command:
 ma docs
 ```
 
+
+## Run tests
+
+Use `tests` command:
+
+``` bash
+ma tests
+```
+
+
 ## Documentation
 
 https://makeapp.readthedocs.io/

{makeapp-2.1.0 → makeapp-2.3.0}/pyproject.toml

@@ -8,12 +8,13 @@ authors = [
 readme = "README.md"
 license = "BSD-3-Clause"
 license-files = ["LICENSE"]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 keywords = ["scaffolding", "development"]
 dependencies = [
     "requests",
     "click",
     "jinja2~=3.1",
+    "pyyaml",
 ]
 
 [project.urls]
@@ -38,6 +39,7 @@ linters = [
 ]
 tests = [
     "pytest",
+    "pytest-datafixtures",
 ]
 
 [build-system]
@@ -75,17 +77,3 @@ exclude_also = [
     "if TYPE_CHECKING:",
 ]
 
-[tool.tox]
-skip_missing_interpreters = true
-env_list = [
-  "py310",
-  "py311",
-  "py312",
-  "py313",
-]
-
-[tool.tox.env_run_base]
-dependency_groups = ["tests"]
-commands = [
-  ["pytest", { replace = "posargs", default = ["tests"], extend = true }],
-]

makeapp-2.3.0/src/makeapp/__init__.py

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

makeapp-2.3.0/src/makeapp/app_templates/__default__/.github/workflows/python-package.yml

@@ -0,0 +1,41 @@
+name: Python package
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.11, 3.12, 3.13, 3.14]
+
+    steps:
+{% raw %}
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Setup uv
+      uses: astral-sh/setup-uv@v6
+    - name: Install deps
+      run: |
+        uv sync --only-group tests
+        uv pip install coveralls
+    - uses: astral-sh/ruff-action@v3
+      with:
+        version: 0.13.1
+        args: check
+    - name: Run tests
+      env:
+        GITHUB_TOKEN: ${{ secrets.github_token }}
+{% endraw %}
+      run: |
+        uv run coverage run -m pytest
+        uv run coveralls --service=github

{makeapp-2.1.0 → makeapp-2.3.0}/src/makeapp/app_templates/__default__/pyproject.toml

@@ -89,26 +89,11 @@ exclude_also = [
     "if TYPE_CHECKING:",
 ]
 
-[tool.tox]
-skip_missing_interpreters = true
-env_list = [
-{% block tox_envlist %}
-  "py310",
-  "py311",
-  "py312",
-  "py313",
-{% endblock %}
-]
-
-[tool.tox.env_run_base]
-dependency_groups = ["tests"]
+[tool.makeapp.tests]
 deps = [
-{% block tox_deps %}
+{% block deps_matests %}
 {% endblock %}
 ]
-commands = [
-  ["pytest", { replace = "posargs", default = ["tests"], extend = true }],
-]
 
 {% block tools_ext %}
 {% endblock %}

{makeapp-2.1.0 → makeapp-2.3.0}/src/makeapp/app_templates/django/.github/workflows/python-package.yml

@@ -5,7 +5,6 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
-  workflow_dispatch:
 
 jobs:
   build:
@@ -14,12 +13,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.11, 3.12, 3.13]
-        django-version: [4.2, 5.1, 5.2]
+        python-version: [3.11, 3.12, 3.13, 3.14]
+        django-version: [4.2, 5.1, 5.2, 6.0]
 
         exclude:
-          - python-version: 3.8
-            django-version: 5.0
+          - python-version: 3.11
+            django-version: 6.0
 
     steps:
 {% raw %}
@@ -33,7 +32,7 @@ jobs:
     - name: Install deps
       run: |
         uv sync --only-group tests
-        uv pip install coveralls "Django~=${{ matrix.django-version }}.0"
+        uv pip install coveralls "django~=${{ matrix.django-version }}.0"
     - uses: astral-sh/ruff-action@v3
       with:
         version: 0.13.1

makeapp-2.3.0/src/makeapp/app_templates/django/pyproject.toml

@@ -0,0 +1,13 @@
+{% extends parent_template %}
+
+{% block deps_tests %}{{ super() }}
+    "pytest-djangoapp>=1.7.0",
+{% endblock %}
+
+{% block cov_omit %}{{ super() }}
+    "src/{{ package_name }}/migrations/*",
+{% endblock %}
+
+{% block deps_matests %}{{ super() }}
+    "django~={%raw%}${{ django-version }}{% endraw %}.0",
+{% endblock %}

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

@@ -1,6 +1,7 @@
 import logging
 import os
 import re
+from contextlib import chdir
 from datetime import date
 from pathlib import Path
 from typing import Any
@@ -12,7 +13,7 @@ from .exceptions import AppMakerException
 from .helpers.vcs import VcsHelper
 from .helpers.venvs import VenvHelper
 from .rendering import Renderer
-from .utils import PYTHON_VERSION, chdir, configure_logging, get_user_dir, read_ini
+from .utils import PYTHON_VERSION, configure_logging, get_user_dir, read_ini
 
 RE_UNKNOWN_MARKER = re.compile(r'{{ [^}]+ }}')
 BASE_PATH = os.path.dirname(__file__)
@@ -112,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)
@@ -301,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.1.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.1.0 → makeapp-2.3.0}/src/makeapp/apptools.py

@@ -1,14 +1,17 @@
 import logging
 import os
+import tomllib
+from contextlib import chdir
 from datetime import datetime
 from pathlib import Path
 
 from .exceptions import ProjectorExeption
 from .helpers.dist import DistHelper
 from .helpers.files import FileHelper
+from .helpers.tests import TestsHelper
 from .helpers.vcs import VcsHelper
 from .helpers.venvs import VenvHelper
-from .utils import chdir, configure_logging, Uv, Ruff, MkDocs
+from .utils import MkDocs, Ruff, Uv, configure_logging
 
 LOG = logging.getLogger(__name__)
 
@@ -362,6 +365,7 @@ class Project:
         self.changelog: ChangelogData | None = None
         self.vcs = VcsHelper.get(project_path)
         self.venv = VenvHelper(project_path)
+        self._setting = {}
 
     def configure_logging(self, verbosity_lvl: int = None, format: str = '%(message)s'):
         """Switches on logging at a given level.
@@ -372,6 +376,25 @@ class Project:
         """
         configure_logging(verbosity_lvl, logger=LOG, format=format)
 
+    def get_settings(self) -> dict | None:
+        """Returns project settings from pyproject.toml (with default) or None if file not found."""
+
+        settings = self._setting
+
+        if not settings:
+
+            path = Path("pyproject.toml")
+            if not path.exists():
+                raise ProjectorExeption('No `pyproject.toml` file found in the current directory.')
+
+            with path.open("rb") as f:
+                data = tomllib.load(f)
+
+            settings = data.get("tool", {}).get("makeapp", {})
+            self._setting = settings
+
+        return settings
+
     def _gather_data(self):
         """Gathers data relevant for project related functions."""
 
@@ -383,11 +406,7 @@ class Project:
 
             LOG.debug(f'Gathering info from `{project_path}` directory ...')
 
-            marker_file = 'pyproject.toml'
-
-            if not os.path.isfile(marker_file):
-                raise ProjectorExeption(f'No `{marker_file}` file found in the current directory.')
-
+            self.get_settings()
             self.vcs.check()
 
             parent_dirname = project_path.parent.name
@@ -506,6 +525,11 @@ class Project:
             self.vcs.push()
             DistHelper.upload()
 
+    def run_tests(self, *, only: list[str] | None = None) -> dict[str, list[str]]:
+        LOG.info('Running tests ...')
+        helper = TestsHelper(settings=self.get_settings().get('tests', {}), only=only)
+        return helper.run_tests()
+
     def style(self):
         LOG.info('Styling ...')
         Ruff.check()
@@ -523,13 +547,12 @@ class Project:
         LOG.info(f'{"Upgrading" if upgrade else "Bootstrapping"} development tools ...')
 
         tools_default = [
-            'tox',
             'ruff==0.13.1',
         ]
 
         method = Uv.tool_upgrade if upgrade else Uv.tool_install
 
-        LOG.info(f'Processing uv ...')
+        LOG.info('Processing uv ...')
 
         if upgrade:
             Uv.upgrade()

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

@@ -5,13 +5,14 @@ from pathlib import Path
 
 import click
 
+from makeapp.helpers.tests import TestsHelper
+
 from .exceptions import MakeappException
 
 try:
     from . import VERSION
     from .appmaker import AppMaker
     from .apptools import VERSION_NUMBER_CHUNKS, Project
-    from .utils import configure_logging
 
 except MakeappException as e:
     click.secho(f'{e}', err=True, fg='red')
@@ -234,6 +235,26 @@ def style(debug):
     click.secho('Done', fg='green')
 
 
+@entry_point.command()
+@option_debug
+@click.option('-o', '--only', multiple=True, help='Run only certain tests. E.g. -o "py314_django600"')
+def tests(debug, only):
+    """Run tests."""
+    project = Project(log_level=logging.DEBUG if debug else logging.INFO)
+    stats = project.run_tests(only=only)
+
+    key_ok = TestsHelper.KEY_OK
+    key_fail = TestsHelper.KEY_FAIL
+
+    for status, color, err in ((key_ok, 'green', False), (key_fail, 'red', True)):
+        if items := stats[status]:
+            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')
+
+
 @entry_point.command()
 @option_debug
 @click.option(

makeapp-2.3.0/src/makeapp/helpers/tests.py

@@ -0,0 +1,129 @@
+import re
+from functools import partial
+from itertools import product
+from pathlib import Path
+from pprint import pformat
+from sys import version_info
+
+import yaml
+
+from ..exceptions import CommandError
+from ..utils import LOG, Uv
+
+
+class TestsHelper:
+
+    _RE_VAR = re.compile(r'\$\{\{\s*([\w-]+)\s*\}\}')
+    _RE_VALID_IDENT = re.compile(r'[^a-zA-Z0-9]')
+
+    KEY_OK = 'OK'
+    KEY_FAIL = 'FAIL'
+
+    def __init__(self, *, settings: dict, only: list[str] | None = None):
+        self._settings = settings
+        self._only = set(only or [])
+
+    @classmethod
+    def apply_context(cls, text: str, context: dict) -> str:
+        """Apply context to a text (resolves variables).
+
+        :param text:
+        :param context:
+        """
+        def replace(match):
+            var_name = match.group(1)
+            return f'{context.get(var_name, match.group(0))}'
+
+        return cls._RE_VAR.sub(replace, text)
+
+    @classmethod
+    def get_matrix_github(cls, fpath: Path):
+        with fpath.open() as f:
+            config = yaml.safe_load(f)
+
+        jobs = config.get('jobs', {})
+        job_name = list(jobs.keys())[0]
+        matrix = jobs[job_name].get('strategy', {}).get('matrix', {})
+        exclusions = matrix.pop('exclude', [])
+        keys = matrix.keys()
+        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'{norm(combination.get(key))}' == f'{norm(val)}' for key, val in exclusion.items()):
+                    is_excluded = True
+                    break
+
+            if not is_excluded:
+                combinations.append(combination)
+
+        return combinations
+
+    def run_tests(self) -> dict[str, list[str]]:
+        settings = self._settings
+
+        workflow_github = Path(settings.get('workflow_github') or 'python-package.yml')
+        if len(workflow_github.parts) == 1:
+            workflow_github = Path('.github', 'workflows', workflow_github)
+
+        matrix = self.get_matrix_github(workflow_github)
+        apply_ctx = self.apply_context
+        make_valid_ident = partial(self._RE_VALID_IDENT.sub, '')
+        deps = settings.get('deps') or []
+        only = self._only
+
+        matrix_lines = '\n  '.join(' '.join(f"{key}:{value}" for key, value in line.items()) for line in matrix)
+        LOG.info(f'Test matrix:\n  {matrix_lines}')
+
+        stats = {
+            self.KEY_OK: [],
+            self.KEY_FAIL: [],
+        }
+
+        for combination in matrix:
+
+            python_version = combination.get('python-version') or f"{version_info.major}.{version_info.minor}"
+            ident_chunks = [make_valid_ident(f'py{python_version}')]
+            deps_resolved = []
+            for dep in deps:
+                dep = apply_ctx(dep, combination)
+                deps_resolved.append(f'"{dep}"')
+                ident_chunks.append(make_valid_ident(dep))
+
+            ident = "_".join(ident_chunks)
+
+            if not only or ident in only:
+                LOG.info(f'Running: {ident}: {combination} ...')
+
+                venv_dir = f'.venv_ma/{ident}'
+                execute = partial(Uv.exec, env={
+                    'VIRTUAL_ENV': venv_dir,
+                    'UV_PROJECT_ENVIRONMENT': venv_dir,
+                })
+                status = self.KEY_OK
+
+                try:
+                    execute(f'sync --only-group tests --python {python_version}')
+
+                    if deps_resolved := ' '.join(deps_resolved):
+                        execute(f'pip install {deps_resolved} --python {venv_dir}')
+
+                    execute('run pytest')
+
+                except CommandError:
+                    status = self.KEY_FAIL
+                    continue
+
+                finally:
+                    stats[status].append(ident)
+
+        return stats

{makeapp-2.1.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.1.0 → makeapp-2.3.0}/src/makeapp/helpers/venvs.py

@@ -29,5 +29,5 @@ class VenvHelper:
         rmtree(f'{path}', ignore_errors=True)
 
     def register_tool(self):
-        LOG.info(f'Registering application CLI as a tool ...')
+        LOG.info('Registering application CLI as a tool ...')
         Uv.tool_install('--force -e .')

{makeapp-2.1.0 → makeapp-2.3.0}/src/makeapp/rendering.py

@@ -1,10 +1,10 @@
 import os
+from contextlib import chdir
 from typing import TYPE_CHECKING
 
 from jinja2 import Environment, FileSystemLoader
 
 from .apptemplate import TemplateFile
-from .utils import chdir
 
 if TYPE_CHECKING:
     from .appmaker import AppMaker

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

@@ -49,23 +49,6 @@ def read_ini(fpath: Path) -> ConfigParser:
     return cfg
 
 
-@contextmanager
-def chdir(target_path):
-    """Context manager.
-     
-    Temporarily switches the current working directory.
-    
-    """
-    curr_dir = os.getcwd()
-    os.chdir(target_path)
-
-    try:
-        yield
-
-    finally:
-        os.chdir(curr_dir)
-
-
 @contextmanager
 def temp_dir() -> Generator[str, None, None]:
     """Context manager to temporarily create a directory."""
@@ -104,10 +87,7 @@ def check_command(command: str, *, hint: str):
     :param hint:
 
     """
-    try:
-        run_command(f'type {command}')
-
-    except CommandError:
+    if shutil.which(command) is None:
         raise CommandError(
             f"Failed to execute '{command}' command. "
             f"Check {hint} is installed and available.")
@@ -159,7 +139,7 @@ class Ruff:
         return run_command(f'ruff {cmd}', capture=False)
 
     @classmethod
-    def check(cls, fix: bool = True) -> list[str]:
+    def check(cls, *, fix: bool = True) -> list[str]:
         return cls._run(f'check{" --fix" if fix else ""}')
 
 
@@ -183,25 +163,29 @@ class Uv:
     """Uv wrapper."""
 
     @classmethod
-    def _run(cls, cmd: str) -> list[str]:
-        return run_command(f'uv {cmd}', capture=False)
+    def exec(cls, cmd: str, env: dict | None = None) -> list[str]:
+        return run_command(f'uv {cmd}', env=env, capture=False)
 
     @classmethod
     def upgrade(cls) -> list[str]:
-        return cls._run('self update')
+        return cls.exec('self update')
 
     @classmethod
     def tool_install(cls, name: str) -> list[str]:
-        return cls._run(f'tool install {name}')
+        return cls.exec(f'tool install {name}')
 
     @classmethod
     def tool_upgrade(cls, name: str) -> list[str]:
-        return cls._run(f'tool upgrade {name} --reinstall')
+        return cls.exec(f'tool upgrade {name} --reinstall')
 
     @classmethod
     def sync(cls) -> list[str]:
-        return cls._run('sync')
+        return cls.exec('sync')
 
     @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.1.0/src/makeapp/__init__.py

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

makeapp-2.1.0/src/makeapp/app_templates/__default__/tests/__init__.py

@@ -1,12 +0,0 @@
-import os
-import sys
-import unittest
-
-DIR_CURRENT = os.path.abspath(os.path.dirname(__file__))
-DIR_PARENT = os.path.dirname(DIR_CURRENT)
-
-sys.path.insert(0, DIR_PARENT)
-
-tests_loader = unittest.TestLoader()
-test_suit = tests_loader.discover(DIR_CURRENT)
-unittest.TextTestRunner().run(test_suit)

makeapp-2.1.0/src/makeapp/app_templates/django/pyproject.toml

@@ -1,19 +0,0 @@
-{% extends parent_template %}
-
-{% block deps_tests %}{{ super() }}
-    "pytest-djangoapp>=1.6.0",
-{% endblock %}
-
-{% block cov_omit %}{{ super() }}
-    "src/{{ package_name }}/migrations/*",
-{% endblock %}
-
-{% block tox_envlist %}
-    "py{310,311,312,313}-dj{42,51,52}",
-{% endblock %}
-
-{% block tox_deps %}{{ super() }}
-    "dj42: Django>=4.1,<4.2",
-    "dj51: Django>=5.1,<5.2",
-    "dj52: Django>=5.2,<5.3",
-{% endblock %}