django-tailwind-cli 2.6.0__tar.gz → 2.7.1__tar.gz

{django_tailwind_cli-2.6.0 → django_tailwind_cli-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-tailwind-cli
-Version: 2.6.0
+Version: 2.7.1
 Summary: Django and Tailwind integration based on the prebuilt Tailwind CSS CLI.
 Home-page: https://django-tailwind-cli.andrich.me/
 License: MIT

{django_tailwind_cli-2.6.0 → django_tailwind_cli-2.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-tailwind-cli"
-version = "2.6.0"
+version = "2.7.1"
 description = "Django and Tailwind integration based on the prebuilt Tailwind CSS CLI."
 authors = ["Oliver Andrich <oliver@andrich.me>"]
 readme = "README.md"

{django_tailwind_cli-2.6.0 → django_tailwind_cli-2.7.1}/src/django_tailwind_cli/management/commands/tailwind.py

@@ -49,7 +49,30 @@ class Command(BaseCommand):
             "runserver",
             help="Start the Django development server and the Tailwind CLI in watch mode.",
         )
-
+        parser.add_argument(
+            "--ipv6",
+            "-6",
+            action="store_true",
+            dest="use_ipv6",
+            help="Tells Django to use an IPv6 address.",
+        )
+        parser.add_argument(
+            "--nothreading",
+            action="store_true",
+            dest="no_threading",
+            help="Tells Django to NOT use threading.",
+        )
+        parser.add_argument(
+            "--noreload",
+            action="store_true",
+            dest="no_reloader",
+            help="Tells Django to NOT use the auto-reloader.",
+        )
+        runserver_parser.add_argument(
+            "--skip-checks",
+            action="store_true",
+            help="Skip system checks.",
+        )
         runserver_parser.add_argument(
             "addrport", nargs="?", help="Optional port number, or ipaddr:port"
         )
@@ -61,11 +84,45 @@ class Command(BaseCommand):
                 "Tailwind CLI in watch mode."
             ),
         )
-
         runserver_plus_parser.add_argument(
-            "addrport", nargs="?", help="Optional port number, or ipaddr:port"
+            "--ipv6",
+            "-6",
+            action="store_true",
+            dest="use_ipv6",
+            help="Tells Django to use an IPv6 address.",
+        )
+        runserver_plus_parser.add_argument(
+            "--nothreading",
+            action="store_true",
+            dest="no_threading",
+            help="Do not run in multithreaded mode.",
+        )
+        runserver_plus_parser.add_argument(
+            "--noreload",
+            action="store_true",
+            dest="no_reloader",
+            help="Tells Django to NOT use the auto-reloader.",
+        )
+        runserver_plus_parser.add_argument(
+            "--pdb",
+            action="store_true",
+            help="Drop into pdb shell at the start of any view.",
+        )
+        runserver_plus_parser.add_argument(
+            "--ipdb",
+            action="store_true",
+            help="Drop into ipdb shell at the start of any view.",
+        )
+        runserver_plus_parser.add_argument(
+            "--pm",
+            action="store_true",
+            help="Drop into (i)pdb shell if an exception is raised in a view.",
+        )
+        runserver_plus_parser.add_argument(
+            "--print-sql",
+            action="store_true",
+            help="Print SQL queries as they're executed.",
         )
-
         runserver_plus_parser.add_argument(
             "--cert-file", help="Optional SSL certificate file to use for the development server."
         )
@@ -76,11 +133,13 @@ class Command(BaseCommand):
         runserver_plus_parser.add_argument(
             "--key-file", help="Optional SSL certificate file to use for the development server."
         )
-
         runserver_plus_parser.add_argument(
             "--reloader-interval",
             help="Optional SSL certificate file to use for the development server.",
         )
+        runserver_plus_parser.add_argument(
+            "addrport", nargs="?", help="Optional port number, or ipaddr:port"
+        )
 
     def handle(self, *_args: Any, **kwargs: Any) -> None:
         """Perform the command's actions."""
@@ -154,12 +213,31 @@ class Command(BaseCommand):
         if addrport := kwargs.get("addrport"):
             debugserver_cmd.append(addrport)
 
+        if kwargs.get("use_ipv6", False):
+            debugserver_cmd.append("--ipv6")
+        if kwargs.get("no_threading", False):
+            debugserver_cmd.append("--nothreading")
+        if kwargs.get("no_reloader", False):
+            debugserver_cmd.append("--noreload")
+        if kwargs.get("skip_checks", False):
+            debugserver_cmd.append("--skip-checks")
+
+        if kwargs.get("print_sql", False):
+            debugserver_cmd.append("--print-sql")
+        if kwargs.get("pdb", False):
+            debugserver_cmd.append("--pdb")
+        if kwargs.get("ipdb", False):
+            debugserver_cmd.append("--ipdb")
+        if kwargs.get("pm", False):
+            debugserver_cmd.append("--pm")
+
         if cert_file := kwargs.get("cert_file"):
             debugserver_cmd.append(f"--cert-file={cert_file}")
         elif cert := kwargs.get("cert"):
             debugserver_cmd.append(f"--cert-file={cert}")
         if key_file := kwargs.get("key_file"):
             debugserver_cmd.append(f"--key-file={key_file}")
+
         if reloader_interval := kwargs.get("reloader_interval"):
             debugserver_cmd.append(f"--reloader-interval={reloader_interval}")
 
@@ -240,9 +318,9 @@ class Command(BaseCommand):
 
     def _download_cli_if_not_exists(self) -> None:
         dest_file = self.config.get_full_cli_path()
-        download_url = self.config.get_download_url()
 
-        if not dest_file.exists():
+        if not dest_file.exists() and self.config.automatic_download:
+            download_url = self.config.get_download_url()
             self.stdout.write(self.style.ERROR("Tailwind CSS CLI not found."))
             self.stdout.write(
                 self.style.WARNING(f"Downloading Tailwind CSS CLI from '{download_url}'")

{django_tailwind_cli-2.6.0 → django_tailwind_cli-2.7.1}/src/django_tailwind_cli/utils.py

@@ -5,6 +5,7 @@ This module contains utility functions to read the configuration, download the C
 the various paths.
 """
 
+import os
 import platform
 from pathlib import Path
 from typing import Tuple, Union
@@ -20,8 +21,15 @@ class Config:
         return getattr(settings, "TAILWIND_CLI_VERSION", "3.3.5")
 
     @property
-    def cli_path(self) -> Union[str, None]:
-        return getattr(settings, "TAILWIND_CLI_PATH", "~/.local/bin/")
+    def cli_path(self) -> Union[Path, None]:
+        p = getattr(settings, "TAILWIND_CLI_PATH", "~/.local/bin/")
+        if p is None:
+            return p
+        return Path(p).expanduser()
+
+    @property
+    def automatic_download(self) -> bool:
+        return bool(getattr(settings, "TAILWIND_CLI_AUTOMATIC_DOWNLOAD", True))
 
     @property
     def src_css(self) -> Union[str, None]:
@@ -44,13 +52,13 @@ class Config:
     def get_system_and_machine(self) -> Tuple[str, str]:
         """Get the system and machine name."""
         system = platform.system().lower()
-        if system == "darwin":  # pragma: no cover
+        if system == "darwin":
             system = "macos"
 
         machine = platform.machine().lower()
-        if machine == "x86_64":  # pragma: no cover
+        if machine in ["x86_64", "amd64"]:
             machine = "x64"
-        elif machine == "aarch64":  # pragma: no cover
+        elif machine == "aarch64":
             machine = "arm64"
 
         return (system, machine)
@@ -58,19 +66,32 @@ class Config:
     def get_download_url(self) -> str:
         """Get the download url for the Tailwind CSS CLI."""
         system, machine = self.get_system_and_machine()
+        extension = ".exe" if system == "windows" else ""
         return (
             "https://github.com/tailwindlabs/tailwindcss/releases/download/"
-            f"v{self.tailwind_version}/tailwindcss-{system}-{machine}"
+            f"v{self.tailwind_version}/tailwindcss-{system}-{machine}{extension}"
         )
 
     def get_full_cli_path(self) -> Path:
         """Get path to the Tailwind CSS CLI."""
+
+        # If Tailwind CSS CLI path points to an existing executable use is.
+        if (
+            self.cli_path
+            and self.cli_path.exists()
+            and self.cli_path.is_file()
+            and os.access(self.cli_path, os.X_OK)
+        ):
+            return self.cli_path
+
+        # Otherwise try to calculate the full cli path as usual.
         system, machine = self.get_system_and_machine()
-        executable_name = f"tailwindcss-{system}-{machine}-{self.tailwind_version}"
+        extension = ".exe" if system == "windows" else ""
+        executable_name = f"tailwindcss-{system}-{machine}-{self.tailwind_version}{extension}"
         if self.cli_path is None:
             return Path(settings.BASE_DIR) / executable_name
         else:
-            return Path(self.cli_path).expanduser() / executable_name
+            return self.cli_path / executable_name
 
     def get_full_src_css_path(self) -> Path:
         """Get path to the source css."""