Merge branch 'alpha'

Author: nickderobertis

.github/workflows/package.yml

@@ -14,8 +14,13 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest, ]
+        os: [ubuntu-latest, macos-latest, ]
         python-version: ["3.8", "3.9", "3.10", ]
+        exclude:
+          - python-version: 3.8
+            os: windows-latest
+          - python-version: 3.9
+            os: windows-latest
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

README.md

@@ -1,7 +1,11 @@
+
+
 [![](https://codecov.io/gh/nickderobertis/flexlate/branch/master/graph/badge.svg)](https://codecov.io/gh/nickderobertis/flexlate)
 [![PyPI](https://img.shields.io/pypi/v/flexlate)](https://pypi.org/project/flexlate/)
 ![PyPI - License](https://img.shields.io/pypi/l/flexlate)
 [![Documentation](https://img.shields.io/badge/documentation-pass-green)](https://nickderobertis.github.io/flexlate/)
+![Tests Run on Ubuntu Python Versions](https://img.shields.io/badge/Tests%20Ubuntu%2FPython-3.8%20%7C%203.9%20%7C%203.10-blue)
+![Tests Run on Macos Python Versions](https://img.shields.io/badge/Tests%20Macos%2FPython-3.8%20%7C%203.9%20%7C%203.10-blue)
 [![Github Repo](https://img.shields.io/badge/repo-github-informational)](https://github.com/nickderobertis/flexlate/)
 
 
@@ -313,6 +317,9 @@ linting, and tests.
 
 Develop documentation by running `nox -s docs` to start up a dev server.
 
+To run tests only, run `nox -s test`. You can pass additional arguments to pytest
+by adding them after `--`, e.g. `nox -s test -- -k test_something`.
+
 ## Author
 
 Created by Nick DeRobertis. MIT License.

flexlate.json

@@ -4,7 +4,7 @@
       "name": "copier-pypi-sphinx-flexlate",
       "path": "https://github.com/nickderobertis/copier-pypi-sphinx-flexlate",
       "type": "copier",
-      "version": "f9d09a366c930f765b650e41ff88d6af89bb7684",
+      "version": "c0687ae24d563ce6c9ead4267eaa06176f186014",
       "git_url": "https://github.com/nickderobertis/copier-pypi-sphinx-flexlate",
       "target_version": null,
       "render_relative_root_in_output": ".",
@@ -37,14 +37,13 @@
         "google_analytics_id": "",
         "os_support": [
           "ubuntu",
-          "macos",
-          "windows"
+          "macos"
         ],
         "minimum_python_version": "3.8",
         "logo_url": "",
         "install_packages": "py-app-conf cookiecutter GitPython"
       },
-      "version": "f9d09a366c930f765b650e41ff88d6af89bb7684",
+      "version": "c0687ae24d563ce6c9ead4267eaa06176f186014",
       "add_mode": "local",
       "root": "."
     },

flexlate/adder.py

@@ -1,7 +1,5 @@
 import os
 import shutil
-import tempfile
-import time
 from copy import deepcopy
 from pathlib import Path
 from typing import Optional
@@ -23,12 +21,11 @@
     stage_and_commit_all,
     update_local_branches_from_remote_without_checkout,
 )
-from flexlate.path_ops import (
-    location_relative_to_new_parent,
-)
+from flexlate.path_ops import location_relative_to_new_parent
 from flexlate.render.multi import MultiRenderer
-from flexlate.styles import SUCCESS_STYLE, INFO_STYLE, console, styled, print_styled
+from flexlate.styles import INFO_STYLE, SUCCESS_STYLE, console, print_styled, styled
 from flexlate.syncer import Syncer
+from flexlate.temp_path import create_temp_path
 from flexlate.template.base import Template
 from flexlate.template_data import TemplateData
 from flexlate.transactions.transaction import (
@@ -344,10 +341,8 @@ def init_project_from_template_source_path(
         renderer: MultiRenderer = MultiRenderer(),
         syncer: Syncer = Syncer(),
     ) -> str:
-        with tempfile.TemporaryDirectory() as temp_dir:
-            temp_path = Path(temp_dir)
-
-            repo = Repo.init(temp_dir)
+        with create_temp_path() as temp_path:
+            repo = Repo.init(temp_path)
 
             def sync():
                 syncer.sync_local_changes_to_flexlate_branches(
@@ -491,31 +486,34 @@ def move_source_path_to_be_relative_to_destination(
                     move_source_path_to_be_relative_to_destination,
                     project_root=final_out_path,
                 )
-                stage_and_commit_all(
-                    repo,
-                    "Move template source path to match permanent destination of project",
-                )
-                sync()
+                # If the final output folder is at the same
+                # level as the temp folder, the relative path will be unchanged, so there will be no changes
+                if repo.is_dirty():
+                    stage_and_commit_all(
+                        repo,
+                        "Move template source path to match permanent destination of project",
+                    )
+                    sync()
 
             return folder_name
 
 
 def _add_template_commit_message(
     template: Template, out_root: Path, project_root: Path
 ) -> str:
-    relative_path = out_root.absolute().relative_to(project_root)
+    relative_path = Path(os.path.relpath(out_root.absolute(), project_root))
     return f"Applied template {template.name} to {relative_path}"
 
 
 def _move_applied_template_config_message(
     template: Template, out_root: Path, project_root: Path
 ) -> str:
-    relative_path = out_root.absolute().relative_to(project_root)
+    relative_path = Path(os.path.relpath(out_root.absolute(), project_root))
     return f"Moved config for {template.name} to {relative_path}"
 
 
 def _add_template_source_commit_message(
     template: Template, out_root: Path, project_root: Path
 ) -> str:
-    relative_path = out_root.absolute().relative_to(project_root)
+    relative_path = Path(os.path.relpath(out_root.absolute(), project_root))
     return f"Added template source {template.name} to {relative_path}"

flexlate/bootstrapper.py

@@ -8,7 +8,7 @@
 from flexlate.config_manager import ConfigManager
 from flexlate.constants import DEFAULT_MERGED_BRANCH_NAME, DEFAULT_TEMPLATE_BRANCH_NAME
 from flexlate.render.multi import MultiRenderer
-from flexlate.styles import print_styled, INFO_STYLE, SUCCESS_STYLE
+from flexlate.styles import INFO_STYLE, SUCCESS_STYLE, print_styled
 from flexlate.template.base import Template
 from flexlate.template_data import TemplateData
 from flexlate.transactions.transaction import FlexlateTransaction

flexlate/branch_update.py

@@ -1,29 +1,29 @@
 import os
 from pathlib import Path
-from typing import Callable, Union, List, Optional
+from typing import Callable, List, Optional, Union
 
-from git import Repo, repo, Head
+from git import Head, Repo, repo
 
 from flexlate.cli_utils import confirm_user
 from flexlate.constants import DEFAULT_MERGED_BRANCH_NAME, DEFAULT_TEMPLATE_BRANCH_NAME
 from flexlate.ext_git import (
-    temp_repo_that_pushes_to_branch,
-    stage_and_commit_all,
-    fast_forward_branch_without_checkout,
+    abort_merge,
     checked_out_template_branch,
+    fast_forward_branch_without_checkout,
+    get_branch_sha,
     merge_branch_into_current,
-    abort_merge,
-    reset_branch_to_commit_without_checkout,
     repo_has_merge_conflicts,
-    get_branch_sha,
+    reset_branch_to_commit_without_checkout,
+    stage_and_commit_all,
+    temp_repo_that_pushes_to_branch,
 )
 from flexlate.path_ops import make_func_that_creates_cwd_and_out_root_before_running
 from flexlate.styles import (
-    print_styled,
     ACTION_REQUIRED_STYLE,
-    styled,
-    QUESTION_STYLE,
     ALERT_STYLE,
+    QUESTION_STYLE,
+    print_styled,
+    styled,
 )
 from flexlate.transactions.transaction import (
     FlexlateTransaction,

flexlate/checker.py

@@ -1,13 +1,13 @@
 from pathlib import Path
-from typing import Sequence, Optional, Dict, Any, List
+from typing import Any, Dict, List, Optional, Sequence
 
 from pydantic import BaseModel
-from rich.console import ConsoleOptions, RenderResult, Console
+from rich.console import Console, ConsoleOptions, RenderResult
 from rich.table import Table
 
 from flexlate.config_manager import ConfigManager
 from flexlate.finder.multi import MultiFinder
-from flexlate.styles import styled, SUCCESS_STYLE, ACTION_REQUIRED_STYLE
+from flexlate.styles import ACTION_REQUIRED_STYLE, SUCCESS_STYLE, styled
 
 
 class CheckResult(BaseModel):

flexlate/cli.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Optional, List
+from typing import List, Optional
 
 import typer
 
@@ -11,7 +11,7 @@
 from flexlate.get_version import get_flexlate_version
 from flexlate.logger import log
 from flexlate.main import Flexlate
-from flexlate.styles import print_styled, INFO_STYLE
+from flexlate.styles import INFO_STYLE, print_styled
 
 MAIN_DOC = """
 fxt is a CLI tool to manage project and file generator templates.

flexlate/config.py

@@ -1,35 +1,35 @@
 import os
 from pathlib import Path
 from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
     List,
     Optional,
     Sequence,
-    Dict,
-    Any,
+    Set,
     Tuple,
     Union,
     cast,
-    Callable,
-    Set,
-    TYPE_CHECKING,
 )
 
 if TYPE_CHECKING:
     from flexlate.update.template import TemplateUpdate
 
-from pyappconf import BaseConfig, AppConfig, ConfigFormats
-from pydantic import BaseModel, Field, validator, Extra, PrivateAttr
+from pyappconf import AppConfig, BaseConfig, ConfigFormats
+from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
 
 from flexlate.add_mode import AddMode, get_expanded_out_root
 from flexlate.constants import DEFAULT_MERGED_BRANCH_NAME, DEFAULT_TEMPLATE_BRANCH_NAME
 from flexlate.exc import (
-    InvalidTemplateTypeException,
-    FlexlateProjectConfigFileNotExistsException,
-    FlexlateConfigFileNotExistsException,
-    TemplateLookupException,
     CannotFindTemplateSourceException,
     CannotRemoveAppliedTemplateException,
     CannotRemoveTemplateSourceException,
+    FlexlateConfigFileNotExistsException,
+    FlexlateProjectConfigFileNotExistsException,
+    InvalidTemplateTypeException,
+    TemplateLookupException,
 )
 from flexlate.finder.multi import MultiFinder
 from flexlate.finder.specific.base import TemplateFinder
@@ -131,6 +131,9 @@ def __init__(self, **kwargs):
 class AppliedTemplateWithSource(BaseModel):
     applied_template: AppliedTemplateConfig
     source: TemplateSource
+    index: int
+    applied_template_config_path: Path
+    source_config_path: Path
 
     def to_template_and_data(self) -> Tuple[Template, TemplateData]:
         return (