djangx 0.1.0.dev3__tar.gz → 0.1.0.dev5__tar.gz

{djangx-0.1.0.dev3 → djangx-0.1.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djangX
-Version: 0.1.0.dev3
+Version: 0.1.0.dev5
 Summary: 
 Author: Kevin Wakhisi
 Author-email: Kevin Wakhisi <kevin@treeolive.tech>

{djangx-0.1.0.dev3 → djangx-0.1.0.dev5}/pyproject.toml

@@ -1,6 +1,10 @@
+[build-system]
+requires = ["uv_build>=0.13.5,<0.14.0"]
+build-backend = "uv_build"
+
 [project]
 name = "djangX"
-version = "0.1.0.dev3"
+version = "0.1.0.dev5"
 description = ""
 readme = "README.md"
 license = "MIT"
@@ -45,17 +49,11 @@ dev = [
     "django-stubs>=6.1.2",
     "djlint>=1.47.0",
     "poethepoet>=0.49.0",
-    "psycopg[binary,pool]>=3.3.6",
-    "vercel>=0.12.0",
     "djangorestframework>=3.18.3",
     "django-filter>=26.2",
     "markdown>=3.11.2",
 ]
 
-[build-system]
-requires = ["uv_build>=0.13.4,<0.14.0"]
-build-backend = "uv_build"
-
 [tool.uv]
 preview-features = [
     "format-command",

{djangx-0.1.0.dev3 → djangx-0.1.0.dev5}/pyproject.toml.orig

@@ -1,9 +1,13 @@
+[build-system]
+requires = ["uv_build>=0.13.5,<0.14.0"]
+build-backend = "uv_build"
+
 [project.urls]
 repository = "https://github.com/treeolive-tech/djangX.git"
 
 [project]
 name = "djangX"
-version = "0.1.0.dev3"
+version = "0.1.0.dev5"
 description = ""
 readme = "README.md"
 license = "MIT"
@@ -31,8 +35,6 @@ dev = [
     "django-stubs>=6.1.2",
     "djlint>=1.47.0",
     "poethepoet>=0.49.0",
-    "psycopg[binary,pool]>=3.3.6",
-    "vercel>=0.12.0",
 
     # rest framework
     "djangorestframework>=3.18.3",
@@ -44,10 +46,6 @@ dev = [
 djangx = "djangx.core.management:main"
 djx = "djangx.core.management:main"
 
-[build-system]
-requires = ["uv_build>=0.13.4,<0.14.0"]
-build-backend = "uv_build"
-
 [tool.uv]
 preview-features = ["format-command", "check-command"]
 

{djangx-0.1.0.dev3 → djangx-0.1.0.dev5}/src/djangx/__init__.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 from typing import Final
 
+__all__: list[str] = ["Package"]
+
 
 class Package:
     name: Final[str] = Path(__file__).resolve().parent.name  # djangx

djangx-0.1.0.dev5/src/djangx/core/__init__.py

@@ -0,0 +1,58 @@
+from pathlib import Path
+from tomllib import load
+from typing import Any
+
+__all__: list[str] = ["DJANGO_SETTINGS_MODULE", "Project"]
+
+
+class Project:
+    def __init__(self, toml_path: Path | None = None) -> None:
+        """Parse *toml_path*, or use empty data if it doesn't exist."""
+        self.path: Path = toml_path or Path.cwd() / "pyproject.toml"
+        self._data: dict[str, Any] = {}
+
+        if self.path.is_file():
+            with open(file=self.path, mode="rb") as f:
+                self._data = load(f)
+
+    def _get_str(self, *keys: str) -> str | None:
+        """Return the string at *keys*, or ``None`` if missing or not a string.
+
+        Examples::
+
+            Project()._get_str("project", "name")  # "olyv"
+            Project()._get_str("project", "version")  # None (not set)
+        """
+        value: Any = self._data
+        for key in keys:
+            if not isinstance(value, dict):
+                return None
+            value = value.get(key)
+        return value if isinstance(value, str) else None
+
+    @property
+    def name(self) -> str:
+        """The ``[project] name`` value.
+
+        Raises:
+            KeyError: If ``[project]`` or ``name`` is missing.
+        """
+        return self._data["project"]["name"]
+
+    @property
+    def description(self) -> str | None:
+        """The ``[project] description`` value, or ``None`` if not a string."""
+        return self._get_str("project", "description")
+
+    @property
+    def settings(self) -> str | None:
+        """The ``[project] settings`` value, or ``None`` if not a string.
+
+        Examples::
+
+            Project().settings  # "app.settings"
+        """
+        return self._get_str("project", "settings")
+
+
+DJANGO_SETTINGS_MODULE: str | None = Project().settings

djangx-0.1.0.dev5/src/djangx/core/asgi.py

@@ -0,0 +1,18 @@
+"""
+ASGI config.
+
+It exposes the ASGI callable as a module-level variable named ``app``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/6.0/howto/deployment/asgi/
+"""
+
+from os import environ
+
+from django.core.asgi import get_asgi_application
+
+from . import DJANGO_SETTINGS_MODULE
+
+assert DJANGO_SETTINGS_MODULE is not None
+environ.setdefault("DJANGO_SETTINGS_MODULE", DJANGO_SETTINGS_MODULE)
+application = get_asgi_application()

{djangx-0.1.0.dev3 → djangx-0.1.0.dev5}/src/djangx/core/management/__init__.py

@@ -2,6 +2,8 @@
 
 from sys import argv
 
+from ... import Package
+from ..utils import ExitCode, print_version
 from .commands import BUILTIN_COMMANDS, HELP_COMMANDS
 
 
@@ -28,7 +30,7 @@ def _run_builtin() -> None:
 def _run_project_or_help(command: str) -> None:
     """Run a command against the project's settings, or show help if none is found."""
 
-    from .. import DJANGO_SETTINGS_MODULE, print_help_message
+    from .. import DJANGO_SETTINGS_MODULE
 
     if DJANGO_SETTINGS_MODULE:
         from os import environ
@@ -47,11 +49,25 @@ def _run_project_or_help(command: str) -> None:
             load_dotenv(dotenv)
 
         execute_from_command_line(argv)
-        return
-
-    print_help_message()
-    if command in HELP_COMMANDS:
-        _run_builtin()
+    else:
+        match argv[1]:
+            case cmd if cmd in HELP_COMMANDS:
+                print(
+                    "No pyproject.toml found (or it's missing a [project] `settings` key).\n\n"
+                    "To see project-specific commands, run this from the root of a "
+                    f"{Package.verbose_name} project, or add to your pyproject.toml:\n\n"
+                    "    [project]\n"
+                    '    settings = "app.settings"'
+                )
+
+            case _:
+                print(
+                    f"Unknown command: '{argv[1]}'\nType '{Package.name} help' for usage."
+                )
+                raise SystemExit(ExitCode.ERROR)
+
+        if command in HELP_COMMANDS:
+            _run_builtin()
 
 
 def main() -> None:
@@ -65,9 +81,6 @@ def main() -> None:
             )
 
         case "-v" | "--version" | "version":
-            from ... import Package
-            from ..utils import print_version
-
             raise SystemExit(print_version(Package.name))
 
         case _ if command in BUILTIN_COMMANDS:

{djangx-0.1.0.dev3 → djangx-0.1.0.dev5}/src/djangx/core/utils/__init__.py

@@ -1,4 +1,3 @@
 from .enum import *
 from .platform import *
-from .pyproject import *
 from .version import *

djangx-0.1.0.dev5/src/djangx/core/wsgi.py

@@ -0,0 +1,18 @@
+"""
+WSGI config.
+
+It exposes the WSGI callable as a module-level variable named ``app``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/6.0/howto/deployment/wsgi/
+"""
+
+from os import environ
+
+from django.core.wsgi import get_wsgi_application
+
+from . import DJANGO_SETTINGS_MODULE
+
+assert DJANGO_SETTINGS_MODULE is not None
+environ.setdefault("DJANGO_SETTINGS_MODULE", DJANGO_SETTINGS_MODULE)
+application = get_wsgi_application()

djangx-0.1.0.dev3/src/djangx/core/__init__.py

@@ -1,27 +0,0 @@
-from pathlib import Path
-from sys import argv
-
-from .. import Package
-from .utils import ExitCode, PyProject
-
-DJANGO_SETTINGS_MODULE: str | None = PyProject(Path.cwd() / "pyproject.toml").settings
-
-
-def print_help_message() -> None:
-    """Print built-in help, or an error and exit if the command is unknown."""
-    from .management.commands import HELP_COMMANDS
-
-    match argv[1]:
-        case cmd if cmd in HELP_COMMANDS:
-            print(
-                f"No pyproject.toml found (or it's missing [tool.{Package.name}] `settings` key), "
-                "so only built-in commands are shown below.\n\n"
-                "To see project-specific commands, run this from the root of a "
-                f"{Package.verbose_name} project, or add to your pyproject.toml:\n\n"
-                f"    [tool.{Package.name}]\n"
-                '    settings = "app.settings"'
-            )
-
-        case _:
-            print(f"Unknown command: '{cmd}'\nType '{Package.name} help' for usage.")
-            raise SystemExit(ExitCode.ERROR)

djangx-0.1.0.dev3/src/djangx/core/asgi.py

@@ -1,22 +0,0 @@
-"""
-ASGI config.
-
-It exposes the ASGI callable as a module-level variable named ``app``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/6.0/howto/deployment/asgi/
-"""
-
-from . import DJANGO_SETTINGS_MODULE
-
-if DJANGO_SETTINGS_MODULE is None:
-    from . import print_help_message
-
-    print_help_message()
-else:
-    from os import environ
-
-    from django.core.asgi import get_asgi_application
-
-    environ.setdefault("DJANGO_SETTINGS_MODULE", DJANGO_SETTINGS_MODULE)
-    application = get_asgi_application()

djangx-0.1.0.dev3/src/djangx/core/utils/pyproject.py

@@ -1,80 +0,0 @@
-"""Read ``pyproject.toml`` data and the project's settings module."""
-
-from pathlib import Path
-from typing import Any
-
-from ... import Package
-
-__all__: list[str] = ["PyProject"]
-
-
-class PyProject:
-    """Read-only view of a parsed ``pyproject.toml`` file.
-
-    Args:
-        toml_path: Path to the ``pyproject.toml`` file.
-
-    Raises:
-        FileNotFoundError: If *toml_path* does not exist.
-        tomllib.TOMLDecodeError: If the file contains invalid TOML.
-
-    Examples::
-
-        p = PyProject(Path("pyproject.toml"))
-        p.name     # "my-project"
-        p.version  # "0.1.0"
-        p.data     # the full parsed dict
-    """
-
-    def __init__(self, toml_path: Path) -> None:
-        """Parse *toml_path* and store the result."""
-        from tomllib import load
-
-        self.path: Path = toml_path
-
-        with open(file=self.path, mode="rb") as f:
-            self._data: dict[str, Any] = load(f)
-
-    @property
-    def name(self) -> str:
-        """The ``[project] name`` value.
-
-        Raises:
-            KeyError: If ``[project]`` or ``name`` is missing.
-        """
-        return self._data["project"]["name"]
-
-    @property
-    def version(self) -> str:
-        """The ``[project] version`` value.
-
-        Raises:
-            KeyError: If ``[project]`` or ``version`` is missing.
-        """
-        return self._data["project"]["version"]
-
-    @property
-    def description(self) -> str | None:
-        """The ``[project] description`` value, or ``None`` if not set."""
-        return self._data["project"].get("description")
-
-    @property
-    def settings(self) -> str | None:
-        """The ``[tool.<package>] settings`` value, or ``None`` if missing or blank.
-
-        Examples::
-
-            # [tool.djangx]
-            # settings = "app.settings"
-            p.settings  # "app.settings"
-        """
-        try:
-            value: Any = self._data["tool"][Package.name]["settings"]
-            return value if isinstance(value, str) and value.strip() else None
-        except KeyError:
-            return None
-
-    @property
-    def data(self) -> dict[str, Any]:
-        """The full parsed TOML as a dict."""
-        return self._data

djangx-0.1.0.dev3/src/djangx/core/wsgi.py

@@ -1,22 +0,0 @@
-"""
-WSGI config.
-
-It exposes the WSGI callable as a module-level variable named ``app``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/6.0/howto/deployment/wsgi/
-"""
-
-from . import DJANGO_SETTINGS_MODULE
-
-if DJANGO_SETTINGS_MODULE is None:
-    from . import print_help_message
-
-    print_help_message()
-else:
-    from os import environ
-
-    from django.core.wsgi import get_wsgi_application
-
-    environ.setdefault("DJANGO_SETTINGS_MODULE", DJANGO_SETTINGS_MODULE)
-    application = get_wsgi_application()