plain 0.8.1__tar.gz → 0.10.0__tar.gz

{plain-0.8.1 → plain-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plain
-Version: 0.8.1
+Version: 0.10.0
 Summary: A web framework for building products with Python.
 Author: Dave Gaeddert
 Author-email: dave.gaeddert@dropseed.dev
@@ -11,7 +11,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: click (>=8.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
-Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Description-Content-Type: text/markdown
 
 <!-- This file is compiled from plain/plain/README.md. Do not edit this file directly. -->

{plain-0.8.1 → plain-0.10.0}/plain/runtime/__init__.py

@@ -1,10 +1,8 @@
 import importlib.metadata
 import sys
-from os import environ
+from importlib.metadata import entry_points
 from pathlib import Path
 
-from dotenv import load_dotenv
-
 from .user_settings import Settings
 
 try:
@@ -16,7 +14,6 @@ except importlib.metadata.PackageNotFoundError:
 # Made available without setup or settings
 APP_PATH = Path.cwd() / "app"
 
-
 # from plain.runtime import settings
 settings = Settings()
 
@@ -30,6 +27,11 @@ def setup():
     Configure the settings (this happens as a side effect of accessing the
     first setting), configure logging and populate the app registry.
     """
+
+    # Packages can hook into the setup process through an entrypoint.
+    for entry_point in entry_points().select(group="plain.setup"):
+        entry_point.load()()
+
     from plain.logs import configure_logging
     from plain.packages import packages
 
@@ -38,15 +40,11 @@ def setup():
             "No app directory found. Are you sure you're in a Plain project?"
         )
 
-    # Automatically put the app dir on the Python path for convenience
-    if APP_PATH not in sys.path:
-        sys.path.insert(0, APP_PATH.as_posix())
-
-    # Load .env files automatically before settings
-    if app_env := environ.get("PLAIN_ENV", ""):
-        load_dotenv(f".env.{app_env}")
-    else:
-        load_dotenv(".env")
+    # Automatically put the project dir on the Python path
+    # which doesn't otherwise happen when you run `plain` commands.
+    # This makes "app.<module>" imports and relative imports work.
+    if APP_PATH.parent not in sys.path:
+        sys.path.insert(0, APP_PATH.parent.as_posix())
 
     configure_logging(settings.LOGGING)
 

{plain-0.8.1 → plain-0.10.0}/plain/runtime/global_settings.py

@@ -59,7 +59,7 @@ SECRET_KEY: str
 # secret key rotation.
 SECRET_KEY_FALLBACKS: list[str] = []
 
-ROOT_URLCONF = "urls"
+ROOT_URLCONF = "app.urls"
 
 # List of upload handler classes to be applied in order.
 FILE_UPLOAD_HANDLERS = [

{plain-0.8.1 → plain-0.10.0}/plain/runtime/user_settings.py

@@ -41,7 +41,7 @@ class Settings:
 
         # Determine the settings module
         if self._settings_module is None:
-            self._settings_module = os.environ.get(ENVIRONMENT_VARIABLE, "settings")
+            self._settings_module = os.environ.get(ENVIRONMENT_VARIABLE, "app.settings")
 
         # First load the global settings from plain
         self._load_module_settings(

{plain-0.8.1 → plain-0.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "plain"
-version = "0.8.1"
+version = "0.10.0"
 description = "A web framework for building products with Python."
 authors = ["Dave Gaeddert <dave.gaeddert@dropseed.dev>"]
 readme = "README.md"
@@ -15,7 +15,6 @@ plain = "plain.cli:cli"
 [tool.poetry.dependencies]
 python = "^3.11"
 jinja2 = "^3.1.2"
-python-dotenv = "^1.0.0"
 click = ">=8.0.0"
 
 [tool.poetry.group.dev.dependencies]