falco-cli 0.26.1__tar.gz → 0.26.2__tar.gz

{falco_cli-0.26.1 → falco_cli-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: falco-cli
-Version: 0.26.1
+Version: 0.26.2
 Summary: Enhance your Django developer experience: CLI and Guides for the Modern Developer.
 Project-URL: Documentation, https://falco.oluwatobi.dev/
 Project-URL: Homepage, https://falco.oluwatobi.dev/
@@ -20,10 +20,12 @@ Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.12
+Requires-Python: >=3.10
 Requires-Dist: autoflake
 Requires-Dist: black
 Requires-Dist: cappa

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/conf.py

@@ -1,4 +1,4 @@
-import falco
+import falco_cli
 
 # Configuration file for the Sphinx documentation builder.
 #
@@ -11,7 +11,7 @@ import falco
 project = "Falco"
 copyright = "Copyright © 2023, Tobi DEGNON"
 author = "Tobi DEGNON"
-version = falco.falco_version
+version = falco_cli.falco_cli_version
 release = version
 
 # -- General configuration ---------------------------------------------------
@@ -66,7 +66,7 @@ html_theme_options = {
     "og_image_url": "https://raw.githubusercontent.com/Tobi-De/falco/main/docs/images/og-image.jpg",
     "nav_links": [
         {"title": "Home", "url": "index"},
-         {
+        {
             "title": "Community",
             "children": [
                 {
@@ -89,8 +89,12 @@ html_theme_options = {
                 },
             ],
         },
-        {"title": "Support", "url": "https://buymeacoffee.com/oluwa.tobi", "icon": "heart"},
-    ]
+        {
+            "title": "Support",
+            "url": "https://buymeacoffee.com/oluwa.tobi",
+            "icon": "heart",
+        },
+    ],
 }
 html_logo = "_static/logo_with_text.svg"
 html_favicon = "_static/falco-logo.svg"

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/guides/deployment.rst

@@ -446,7 +446,7 @@ I can recommend, some of which even offer some kind of free usage to reduce your
 
 
 Managed solutions
-^^^^^^^^^^^^^^^^^
+*****************
 
 These are the platforms that handle much of the infrastructure for you, in exchange for a higher cost. Typically, these require the least amount of work once you become familiar with how they work.
 Even though my experience with these platforms is limited, they are generally similarly priced and quite user-friendly. The descriptions provided below are directly sourced from their respective websites.
@@ -466,7 +466,7 @@ Even though my experience with these platforms is limited, they are generally si
 
 
 Self-Managed solutions
-^^^^^^^^^^^^^^^^^^^^^^
+**********************
 
 If you're new to the concept, the term **self-hosting** might be misleading. Typically, **self-hosting** is used to refer to the practice of renting a Virtual Private Server (VPS)
 and handling all the work yourself, rather than paying someone else to do it for you. While this method might be cheaper, true **self-hosting** technically requires owning your
@@ -475,7 +475,7 @@ encourage you to do your own research. If your budget allows, consider trying bo
 
 
 Self-hostable P.A.A.S
-*********************
+^^^^^^^^^^^^^^^^^^^^^
 
 These P.A.A.S solutions necessitate the purchase of your own server (unless you utilize their offerings), but they simplify your tasks by providing an experience akin to that of a managed solution.
 
@@ -493,7 +493,7 @@ In case it wasn't clear, caprover is my PaaS of choice.
 
 
 Bare-bone VPS
-*************
+^^^^^^^^^^^^^
 
 This section introduces bare-metal solutions: a list of Virtual Private Servers (VPS) providers. This is likely the most affordable option, but it also requires the most effort on your part.
 The offerings in this category are diverse in range and price, so you have plenty of choices. However, be prepared to invest more time unless you opt to automate some processes,
@@ -511,7 +511,7 @@ for instance, by using a tool like `ansible <https://www.ansible.com>`_.
 * `Contabo <https://contabo.com/>`_
 
 Personal Recommendations
-^^^^^^^^^^^^^^^^^^^^^^^^
+************************
 
 If you're feeling a bit overwhelmed by the options provided above, here are my personal recommendations:
 
@@ -541,7 +541,7 @@ Alternative strategies
 The web is not the only medium to distribute your app. It's the most popular one, but certainly not the sole option.
 
 Serverless
-^^^^^^^^^^
+**********
 
 The serverless trend appears to have slowed down lately, but there are still use cases. I have almost no experience with this approach, but it promises to run
 your app without constantly active servers at the lowest possible cost.
@@ -552,7 +552,7 @@ and then the server is stopped. A server is still involved, but it is not runnin
 The most popular solution in the Python ecosystem seems to be `zappa <https://github.com/zappa/Zappa>`_.
 
 Desktop / Mobile app
-^^^^^^^^^^^^^^^^^^^^
+*********************
 
 Packaging your apps as mobile or desktop applications remains an option, though the use cases for this are quite niche. If your project was better suited as a desktop app from the outset,
 perhaps Django wasn't the appropriate tool to begin with.

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/crud.rst

@@ -8,7 +8,7 @@ Accelerate prototyping with basic CRUD (Create, Read, Update, Delete) python vie
 CRUD
 ----
 
-.. cappa:: falco.commands.ModelCRUD
+.. cappa:: falco_cli.commands.ModelCRUD
 
 .. warning::
 
@@ -196,9 +196,9 @@ Below is an example of the context each template will receive.
 .. jupyter-execute::
     :hide-code:
 
-    from falco.commands.crud.model_crud import HtmlBlueprintContext
-    from falco.commands.crud.model_crud import get_html_blueprint_context
-    from falco.commands.crud.model_crud import DjangoModel
+    from falco_cli.commands.crud.model_crud import HtmlBlueprintContext
+    from falco_cli.commands.crud.model_crud import get_html_blueprint_context
+    from falco_cli.commands.crud.model_crud import DjangoModel
     from pprint import pprint
 
     dj_model = DjangoModel(

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/htmx.rst

@@ -8,7 +8,7 @@ A set of handy utilities for easily obtaining the htmx library and its extension
 htmx
 ----
 
-.. cappa:: falco.commands.Htmx
+.. cappa:: falco_cli.commands.Htmx
 
 Download the htmx javascript library. You won’t have to download htmx or its extensions often but at least if you need it, I think this
 is an easy way to get the file available locally.
@@ -42,7 +42,7 @@ the command without specifying any arguments, it will list all the available ext
 Similar to the `htmx` commands, this will also use your ``pyproject.toml`` file if it's found. However,
 it's solely for downloading the extensions file next to your ``htmx.min.js`` file, in case no path was specified in the command.
 
-.. cappa:: falco.commands.HtmxExtension
+.. cappa:: falco_cli.commands.HtmxExtension
 
 **Example**
 

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/index.rst

@@ -24,7 +24,7 @@ Additionally, these commands require acces to your virtual environment, so make
     experienced it a few times myself. The simplest solution for now is to install the ``falco-cli`` in the same virtual environment as your project.
     This should resolve the issue.
 
-.. cappa:: falco.__main__.Falco
+.. cappa:: falco_cli.__main__.FalcoCLI
 
 .. toctree::
    :hidden:

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/migrations.rst

@@ -10,7 +10,7 @@ Remove / Reset your migrations
 rm-migrations
 -------------
 
-.. cappa:: falco.commands.RmMigrations
+.. cappa:: falco_cli.commands.RmMigrations
 
 .. warning::
    This command will delete all your migrations files, be sure to commit your changes before running this command.
@@ -41,7 +41,7 @@ then the following command might be a better option than running ``rm-migrations
 reset-migrations
 ----------------
 
-.. cappa:: falco.commands.ResetMigrations
+.. cappa:: falco_cli.commands.ResetMigrations
 
 .. note::
     Before running this command, make sure you have applied any pending migrations, ``makemigrations && migrate``. The idea is to reset the migrations while keeping the data. If your current database does not have up to date migrations, it will fail.

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/start_app.rst

@@ -3,7 +3,7 @@
 Start Application
 =================
 
-.. cappa:: falco.commands.StartApp
+.. cappa:: falco_cli.commands.StartApp
 
 This command executes Django's ``startapp``, along with a few additional tasks:
 

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/start_project/index.rst

@@ -3,7 +3,7 @@
 Start project
 =============
 
-.. cappa:: falco.commands.StartProject
+.. cappa:: falco_cli.commands.StartProject
 
 Initialize a new django project the falco way. This project-starter makes several assumptions; we'll go through the most important choices I made in the next couples of sections.
 I'll list some alternatives below in case you don't agree with my choices. But even if you choose to use an alternative, most commands
@@ -35,13 +35,13 @@ can still bring you value.
 .. admonition:: Experimental
   :class: important
 
-  You can update your project to stay current with the latest changes in the project starter. Please note that this is an experimental feature. Ensure you commit your 
-  changes before running the command. If there are conflicts, ``.rej`` files will be generated, which you will need to review and manually update the corresponding files 
+  You can update your project to stay current with the latest changes in the project starter. Please note that this is an experimental feature. Ensure you commit your
+  changes before running the command. If there are conflicts, ``.rej`` files will be generated, which you will need to review and manually update the corresponding files
   if necessary.
 
   .. code-block:: shell
 
-    falco update-project  
+    falco update-project
 
 
 The subsequent sections will delve deeper into the folder structure, package choices, and provide guidance on deploying your project.

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/sync_dotenv.rst

@@ -4,7 +4,7 @@ Sync Dotenv files
 =================
 
 
-.. cappa:: falco.commands.SyncDotenv
+.. cappa:: falco_cli.commands.SyncDotenv
 
 
 Any Django project created with the `start-project </guides/start_project.html>`_ command comes with a ``.env.template`` file. It serves as an example for the environment variables that

{falco_cli-0.26.1 → falco_cli-0.26.2}/docs/the_cli/work.rst

@@ -3,7 +3,7 @@
 Work - Running multiple process in one session
 ==============================================
 
-.. cappa:: falco.commands.Work
+.. cappa:: falco_cli.commands.Work
 
 
 This command allows you to run multiple commands simultaneously. Typically, when working with a large or growing django project, you

{falco_cli-0.26.1 → falco_cli-0.26.2}/pyproject.toml

@@ -18,7 +18,7 @@ license = "MIT"
 authors = [
   { name = "Tobi DEGNON", email = "tobidegnon@proton.me" },
 ]
-requires-python = ">=3.12"
+requires-python = ">=3.10"
 classifiers = [
   "Development Status :: 4 - Beta",
   "Framework :: Django :: 4",
@@ -30,6 +30,8 @@ classifiers = [
   "Natural Language :: English",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
@@ -58,11 +60,11 @@ urls.Homepage = "https://falco.oluwatobi.dev/"
 urls.Issues = "https://github.com/tobi-de/falco/issues"
 urls.Source = "https://github.com/tobi-de/falco"
 
-scripts.falco = "falco.__main__:main"
+scripts.falco = "falco_cli.__main__:main"
 
 [tool.hatch.build.targets.wheel]
 packages = [
-  "src/falco",
+  "src/falco_cli",
 ]
 
 [tool.hatch.env]
@@ -120,7 +122,7 @@ lock-filename = "docs/requirements.txt"
 allow-direct-references = true
 
 [tool.hatch.version]
-path = "src/falco/__about__.py"
+path = "src/falco_cli/__about__.py"
 
 [tool.ruff]
 exclude = [
@@ -145,11 +147,11 @@ lint.extend-per-file-ignores."demo/config/settings.py" = [
 lint.extend-per-file-ignores."demo/demo/orders/migrations/*.py" = [
   "RUF012",
 ]
-lint.extend-per-file-ignores."docs/conf.py" = [
-  "A001",
+lint.extend-per-file-ignores."docs/_static/snippets/entry_model.py" = [
   "INP001",
 ]
-lint.extend-per-file-ignores."docs/_static/snippets/entry_model.py" = [
+lint.extend-per-file-ignores."docs/conf.py" = [
+  "A001",
   "INP001",
 ]
 lint.extend-per-file-ignores."src/falco/commands/crud/model_crud.py" = [
@@ -178,11 +180,11 @@ testpaths = [
 [tool.coverage.paths]
 falco = [
   "src/falco",
-  "*/falco/src/falco",
+  "*/falco_cli/src/falco",
 ]
 tests = [
   "tests",
-  "*/falco/tests",
+  "*/falco_cli/tests",
 ]
 
 [tool.coverage.report]
@@ -195,7 +197,7 @@ exclude_lines = [
 [tool.coverage.run]
 branch = true
 omit = [
-  "src/falco/__about__.py",
+  "src/falco_cli/__about__.py",
 ]
 parallel = true
 source_pkgs = [
@@ -207,7 +209,7 @@ source_pkgs = [
 allow_dirty = false
 commit = true
 commit_args = "--no-verify"
-current_version = "0.26.1"
+current_version = "0.26.2"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "Bump version: {current_version} → {new_version}"
@@ -224,6 +226,6 @@ tag_message = "Bump version: {current_version} → {new_version}"
 tag_name = "v{new_version}"
 
 [[tool.bumpversion.files]]
-filename = "src/falco/__about__.py"
+filename = "src/falco_cli/__about__.py"
 replace = '__version__ = "{new_version}"'
 search = '__version__ = "{current_version}"'

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present Tobi DEGNON <tobidegnon@proton.me>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.26.1"
+__version__ = "0.26.2"

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/__init__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 from .__about__ import __version__
 
-falco_version = __version__
+falco_cli_version = __version__

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/__main__.py

@@ -1,20 +1,20 @@
 import cappa
-from falco.commands import Htmx
-from falco.commands import HtmxExtension
-from falco.commands import ModelCRUD
-from falco.commands import ResetMigrations
-from falco.commands import RmMigrations
-from falco.commands import StartApp
-from falco.commands import StartProject
-from falco.commands import SyncDotenv
-from falco.commands import UpdateProject
-from falco.commands import Work
+from falco_cli.commands import Htmx
+from falco_cli.commands import HtmxExtension
+from falco_cli.commands import ModelCRUD
+from falco_cli.commands import ResetMigrations
+from falco_cli.commands import RmMigrations
+from falco_cli.commands import StartApp
+from falco_cli.commands import StartProject
+from falco_cli.commands import SyncDotenv
+from falco_cli.commands import UpdateProject
+from falco_cli.commands import Work
 
 
 @cappa.command(
     help="Enhance your Django developer experience: CLI and Guides for the Modern Django Developer.",
 )
-class Falco:
+class FalcoCLI:
     subcommand: cappa.Subcommands[
         StartProject
         | UpdateProject
@@ -30,7 +30,7 @@ class Falco:
 
 
 def main():
-    cappa.invoke(Falco)
+    cappa.invoke(FalcoCLI)
 
 
 if __name__ == "__main__":

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/crud/model_crud.py

@@ -5,14 +5,14 @@ from typing import TypedDict
 
 import cappa
 import parso
-from falco import checks
-from falco.config import CRUDConfig
-from falco.config import read_falco_config
-from falco.utils import get_project_name
-from falco.utils import RICH_ERROR_MARKER
-from falco.utils import RICH_SUCCESS_MARKER
-from falco.utils import run_in_shell
-from falco.utils import simple_progress
+from falco_cli import checks
+from falco_cli.config import CRUDConfig
+from falco_cli.config import read_falco_config
+from falco_cli.utils import get_project_name
+from falco_cli.utils import RICH_ERROR_MARKER
+from falco_cli.utils import RICH_SUCCESS_MARKER
+from falco_cli.utils import run_in_shell
+from falco_cli.utils import simple_progress
 from rich import print as rich_print
 
 from .utils import extract_python_file_templates

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/crud/utils.py

@@ -3,7 +3,7 @@ import subprocess
 from pathlib import Path
 
 import cappa
-from falco.utils import simple_progress
+from falco_cli.utils import simple_progress
 from jinja2 import Template
 
 
@@ -18,7 +18,7 @@ def render_to_string(template_content: str, context: dict):
 
 
 def get_crud_blueprints_path() -> Path:
-    package = importlib.util.find_spec("falco")
+    package = importlib.util.find_spec("falco_cli")
     if package is None:
         raise cappa.Exit("The falco base install path could not be found.", code=1)
     return Path(package.submodule_search_locations[0]) / "crud"

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/htmx.py

@@ -4,10 +4,10 @@ from pathlib import Path
 from typing import Annotated
 
 import cappa
-from falco.config import read_falco_config
-from falco.config import write_falco_config
-from falco.utils import get_pyproject_file
-from falco.utils import network_request_with_progress
+from falco_cli.config import read_falco_config
+from falco_cli.config import write_falco_config
+from falco_cli.utils import get_pyproject_file
+from falco_cli.utils import network_request_with_progress
 from httpx import codes
 from rich import print as rich_print
 from rich.panel import Panel

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/htmx_extension.py

@@ -3,10 +3,10 @@ from typing import Annotated
 
 import cappa
 import httpx
-from falco.config import read_falco_config
-from falco.utils import get_pyproject_file
-from falco.utils import network_request_with_progress
-from falco.utils import simple_progress
+from falco_cli.config import read_falco_config
+from falco_cli.utils import get_pyproject_file
+from falco_cli.utils import network_request_with_progress
+from falco_cli.utils import simple_progress
 from rich import print as rich_print
 from rich.console import Console
 from rich.panel import Panel

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/reset_migrations.py

@@ -3,9 +3,9 @@ from pathlib import Path
 from typing import Annotated
 
 import cappa
-from falco.utils import get_project_name
-from falco.utils import run_in_shell
-from falco.utils import simple_progress
+from falco_cli.utils import get_project_name
+from falco_cli.utils import run_in_shell
+from falco_cli.utils import simple_progress
 from rich import print as rich_print
 
 from .rm_migrations import RmMigrations

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/rm_migrations.py

@@ -2,10 +2,10 @@ from pathlib import Path
 from typing import Annotated
 
 import cappa
-from falco import checks
-from falco.utils import get_project_name
-from falco.utils import run_in_shell
-from falco.utils import simple_progress
+from falco_cli import checks
+from falco_cli.utils import get_project_name
+from falco_cli.utils import run_in_shell
+from falco_cli.utils import simple_progress
 from rich import print as rich_print
 
 

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/start_app.py

@@ -4,10 +4,10 @@ from typing import Annotated
 
 import cappa
 import parso
-from falco.commands.crud.utils import run_python_formatters
-from falco.utils import get_project_name
-from falco.utils import run_in_shell
-from falco.utils import simple_progress
+from falco_cli.commands.crud.utils import run_python_formatters
+from falco_cli.utils import get_project_name
+from falco_cli.utils import run_in_shell
+from falco_cli.utils import simple_progress
 
 
 def get_settings_file_path() -> str:

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/start_project.py

@@ -12,21 +12,19 @@ import cappa
 from cookiecutter.config import get_user_config
 from cookiecutter.exceptions import CookiecutterException
 from cookiecutter.main import cookiecutter
-from falco.commands.crud.utils import run_html_formatters
-from falco.config import write_falco_config
-from falco.utils import clean_project_name
-from falco.utils import is_new_falco_cli_available
-from falco.utils import RICH_INFO_MARKER
-from falco.utils import RICH_SUCCESS_MARKER
-from falco.utils import simple_progress
+from falco_cli.commands.crud.utils import run_html_formatters
+from falco_cli.config import write_falco_config
+from falco_cli.utils import clean_project_name
+from falco_cli.utils import is_new_falco_cli_available
+from falco_cli.utils import RICH_INFO_MARKER
+from falco_cli.utils import RICH_SUCCESS_MARKER
+from falco_cli.utils import simple_progress
+from falco_cli.utils import get_username
 from rich import print as rich_print
 from rich.prompt import Prompt
 
 
-DEFAULT_SKIP = [
-    "playground.ipynb",
-    "README.md",
-]
+DEFAULT_SKIP = ["playground.ipynb", "README.md", "*/static/*"]
 
 
 @cappa.command(help="Initialize a new django project the falco way.")
@@ -126,10 +124,6 @@ class StartProject:
         author_name, author_email = get_authors_info()
         with simple_progress("Initializing your new django project... :sunglasses:"):
             try:
-                try:
-                    username = os.getlogin()
-                except OSError:
-                    username = "tobi"
                 project_dir = cookiecutter(
                     self.blueprint,
                     no_input=True,
@@ -139,7 +133,7 @@ class StartProject:
                         "project_name": self.project_name,
                         "author_name": author_name,
                         "author_email": author_email,
-                        "username": username,
+                        "username": get_username(),
                         "secret_key": f"django-insecure-{secrets.token_urlsafe(32)}",
                     },
                 )

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/sync_dotenv.py

@@ -5,7 +5,7 @@ from typing import Annotated
 
 import cappa
 import tomlkit
-from falco.utils import get_project_name
+from falco_cli.utils import get_project_name
 from rich import print as rich_print
 from rich.prompt import Prompt
 

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/update_project.py

@@ -4,9 +4,6 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import Annotated
 from typing import Any
-from typing import Dict
-from typing import Optional
-from typing import Set
 
 import cappa
 import tomlkit
@@ -15,11 +12,12 @@ from cruft import diff as cruft_diff
 from cruft._commands import utils
 from cruft._commands.update import _apply_project_updates
 from cruft._commands.utils.iohelper import AltTemporaryDirectory
-from falco import checks
-from falco.config import FalcoConfig
-from falco.utils import get_project_name
-from falco.utils import RICH_INFO_MARKER
-from falco.utils import RICH_SUCCESS_MARKER
+from falco_cli import checks
+from falco_cli.config import FalcoConfig
+from falco_cli.utils import get_project_name
+from falco_cli.utils import get_username
+from falco_cli.utils import RICH_INFO_MARKER
+from falco_cli.utils import RICH_SUCCESS_MARKER
 from rich import print as rich_print
 
 
@@ -44,6 +42,7 @@ def cruft_state_from(config: FalcoConfig, project_name: str, author_name: str, a
                 "project_name": project_name,
                 "author_name": author_name,
                 "author_email": author_email,
+                "username": get_username(),
                 "secret_key": secrets.token_hex(24),
                 "_template": config["blueprint"],
             }
@@ -58,13 +57,12 @@ class UpdateProject:
         bool,
         cappa.Arg(default=False, short="-d", long="--diff", help="Show diff of changes."),
     ]
+    interactive: Annotated[
+        bool,
+        cappa.Arg(default=False, short="-i", long="--interactive", help="Interactive mode"),
+    ]
 
     def __call__(self, project_name: Annotated[str, cappa.Dep(get_project_name)]) -> None:
-        # if is_new_falco_cli_available(fail_on_error=True):
-        #     raise cappa.Exit(
-        #         "You need have the latest version of falco-cli to update.", code=1
-        #     )
-
         checks.clean_git_repo()
 
         pyproject_path = Path("pyproject.toml")
@@ -86,7 +84,7 @@ class UpdateProject:
             raise cappa.Exit(code=0)
 
         with cruft_file(cruft_state):
-            last_commit = cruft_update(allow_untracked_files=True)
+            last_commit = cruft_update(allow_untracked_files=True, skip_apply_ask=not self.interactive)
         if last_commit is None:
             rich_print(f"{RICH_INFO_MARKER} Nothing to do, project is already up to date!")
             raise cappa.Exit(code=0)
@@ -99,13 +97,13 @@ def cruft_update(
     project_dir: Path = Path("."),
     cookiecutter_input: bool = False,
     refresh_private_variables: bool = False,
-    skip_apply_ask: bool = False,
+    skip_apply_ask: bool = True,
     skip_update: bool = False,
-    checkout: Optional[str] = None,
+    checkout: str | None = None,
     strict: bool = True,
     allow_untracked_files: bool = False,
-    extra_context: Optional[Dict[str, Any]] = None,
-    extra_context_file: Optional[Path] = None,
+    extra_context: dict[str, Any] | None = None,
+    extra_context_file: Path | None = None,
 ) -> bool:
     """Update specified project's cruft to the latest and greatest release."""
     cruft_file = utils.cruft.get_cruft_file(project_dir)
@@ -123,7 +121,7 @@ def cruft_update(
             return False
 
         extra_context_from_cli = extra_context
-        with open(extra_context_file, "r") as extra_context_fp:
+        with open(extra_context_file) as extra_context_fp:
             extra_context = json.load(extra_context_fp) or {}
         extra_context = extra_context.get("context") or {}
         extra_context = extra_context.get("cookiecutter") or {}
@@ -154,7 +152,7 @@ def cruft_update(
         repo_dir = tmpdir / "repo"
         current_template_dir = tmpdir / "current_template"
         new_template_dir = tmpdir / "new_template"
-        deleted_paths: Set[Path] = set()
+        deleted_paths: set[Path] = set()
         # Clone the template
         with utils.cookiecutter.get_cookiecutter_repo(cruft_state["template"], repo_dir, checkout) as repo:
             last_commit = repo.head.object.hexsha

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/commands/work.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Annotated
 
 import cappa
-from falco.config import read_falco_config
+from falco_cli.config import read_falco_config
 from honcho.manager import Manager
 
 from .sync_dotenv import parse as parse_dotenv

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/config.py

@@ -1,7 +1,11 @@
 from pathlib import Path
 from typing import cast
 from typing import TypedDict
-from typing import Unpack
+
+try:
+    from typing import Unpack
+except ImportError:
+    from typing_extensions import Unpack
 
 import tomlkit
 

{falco_cli-0.26.1/src/falco → falco_cli-0.26.2/src/falco_cli}/utils.py

@@ -1,4 +1,5 @@
 import ast
+import os
 import inspect
 import subprocess
 from collections.abc import Callable
@@ -9,7 +10,7 @@ from typing import TypeVar
 import cappa
 import httpx
 import tomlkit
-from falco import falco_version
+from falco_cli import falco_cli_version
 from rich.progress import Progress
 from rich.progress import SpinnerColumn
 from rich.progress import TextColumn
@@ -26,6 +27,13 @@ def clean_project_name(val: str) -> str:
     return val.strip().replace(" ", "_").replace("-", "_")
 
 
+def get_username() -> str:
+    try:
+        return os.getlogin()
+    except OSError:
+        return "tobi"
+
+
 def get_pyproject_file() -> Path:
     pyproject_path = Path("pyproject.toml")
     if pyproject_path.exists():
@@ -92,7 +100,7 @@ def is_new_falco_cli_available() -> bool:
             "Checking for new falco version...",
         ) as response:
             latest_version = response.json()["info"]["version"]
-            current_version = falco_version
+            current_version = falco_cli_version
             return latest_version != current_version
     except cappa.Exit:
         return False

{falco_cli-0.26.1 → falco_cli-0.26.2}/tests/commands/test_crud.py

@@ -4,7 +4,7 @@ from pathlib import Path
 import cappa
 import pytest
 from cappa.testing import CommandRunner
-from falco.config import write_falco_config
+from falco_cli.config import write_falco_config
 
 views_functions = ["post_list", "post_detail", "post_update", "post_create"]
 html_templates = [

{falco_cli-0.26.1 → falco_cli-0.26.2}/tests/commands/test_htmx.py

@@ -3,9 +3,9 @@ from unittest.mock import patch
 
 import pytest
 from cappa.testing import CommandRunner
-from falco.commands.htmx import Htmx
-from falco.config import read_falco_config
-from falco.config import write_falco_config
+from falco_cli.commands.htmx import Htmx
+from falco_cli.config import read_falco_config
+from falco_cli.config import write_falco_config
 
 
 @pytest.fixture(autouse=True)
@@ -13,7 +13,7 @@ def mock_latest_tag_getter():
     def _get_latest_tag():
         return "1.9.10"
 
-    with patch("falco.commands.htmx.get_latest_tag", new=_get_latest_tag):
+    with patch("falco_cli.commands.htmx.get_latest_tag", new=_get_latest_tag):
         yield
 
 

{falco_cli-0.26.1 → falco_cli-0.26.2}/tests/commands/test_htmx_extension.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 from cappa.testing import CommandRunner
-from falco.config import write_falco_config
+from falco_cli.config import write_falco_config
 
 
 def test_htmx_ext_download(runner: CommandRunner):

{falco_cli-0.26.1 → falco_cli-0.26.2}/tests/commands/test_reset_migrations.py

@@ -1,7 +1,7 @@
 import subprocess
 
 from cappa.testing import CommandRunner
-from falco.utils import run_in_shell
+from falco_cli.utils import run_in_shell
 
 
 def makemigrations():

{falco_cli-0.26.1 → falco_cli-0.26.2}/tests/commands/test_start_project.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 import pytest
 from cappa.testing import CommandRunner
-from falco.config import read_falco_config
+from falco_cli.config import read_falco_config
 
 
 def all_files_are_correctly_generated(project_name, project_dir: Path) -> bool:

{falco_cli-0.26.1 → falco_cli-0.26.2}/tests/commands/test_work.py

@@ -1,8 +1,8 @@
 import pytest
-from falco.commands.work import default_address
-from falco.commands.work import default_server_cmd
-from falco.commands.work import Work
-from falco.config import write_falco_config
+from falco_cli.commands.work import default_address
+from falco_cli.commands.work import default_server_cmd
+from falco_cli.commands.work import Work
+from falco_cli.config import write_falco_config
 
 
 def test_env_resolution(tmp_path):
@@ -27,7 +27,10 @@ def test_with_pyproject_file(pyproject_toml):
 
 
 def test_override_server(pyproject_toml):
-    work = {"server": "python manage.py runserver", "qcluster": "python manage.py qcluster"}
+    work = {
+        "server": "python manage.py runserver",
+        "qcluster": "python manage.py qcluster",
+    }
     write_falco_config(pyproject_path=pyproject_toml, work=work)
     assert Work().get_commands() == work
 

{falco_cli-0.26.1 → falco_cli-0.26.2}/tests/conftest.py

@@ -7,7 +7,7 @@ from unittest.mock import patch
 
 import pytest
 from cappa.testing import CommandRunner
-from falco.__main__ import Falco
+from falco_cli.__main__ import FalcoCLI
 
 
 @pytest.fixture(autouse=True)
@@ -17,7 +17,7 @@ def change_test_dir(monkeypatch, tmp_path):
 
 @pytest.fixture
 def runner():
-    return CommandRunner(Falco)
+    return CommandRunner(FalcoCLI)
 
 
 toolbox = Path(__file__).parent.parent / "packages" / "toolbox/src/falco_toolbox"