plain 0.8.0__tar.gz → 0.11.0__tar.gz

{plain-0.8.0 → plain-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plain
-Version: 0.8.0
+Version: 0.11.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.0 → plain-0.11.0}/plain/cli/cli.py

@@ -251,7 +251,7 @@ def preflight_checks(package_label, deploy, fail_level, databases):
             msg = header + body + footer
             click.echo(msg, err=True)
         else:
-            click.echo("Preflight check identified no issues.", err=True)
+            click.secho("✔ Preflight check identified no issues.", err=True, fg="green")
 
 
 @plain_cli.command()

{plain-0.8.0 → plain-0.11.0}/plain/http/request.py

@@ -267,12 +267,12 @@ class HttpRequest:
 
     @property
     def scheme(self):
-        if settings.SECURE_PROXY_SSL_HEADER:
+        if settings.HTTPS_PROXY_HEADER:
             try:
-                header, secure_value = settings.SECURE_PROXY_SSL_HEADER
+                header, secure_value = settings.HTTPS_PROXY_HEADER
             except ValueError:
                 raise ImproperlyConfigured(
-                    "The SECURE_PROXY_SSL_HEADER setting must be a tuple containing "
+                    "The HTTPS_PROXY_HEADER setting must be a tuple containing "
                     "two values."
                 )
             header_value = self.META.get(header)

{plain-0.8.0 → plain-0.11.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.0 → plain-0.11.0}/plain/runtime/global_settings.py

@@ -50,6 +50,20 @@ HTTPS_REDIRECT_ENABLED = True
 HTTPS_REDIRECT_EXEMPT = []
 HTTPS_REDIRECT_HOST = None
 
+# If your Plain app is behind a proxy that sets a header to specify secure
+# connections, AND that proxy ensures that user-submitted headers with the
+# same name are ignored (so that people can't spoof it), set this value to
+# a tuple of (header_name, header_value). For any requests that come in with
+# that header/value, request.is_https() will return True.
+# WARNING! Only set this if you fully understand what you're doing. Otherwise,
+# you may be opening yourself up to a security risk.
+HTTPS_PROXY_HEADER = None
+
+# Whether to use the X-Forwarded-Host and X-Forwarded-Port headers
+# when determining the host and port for the request.
+USE_X_FORWARDED_HOST = False
+USE_X_FORWARDED_PORT = False
+
 # A secret key for this particular Plain installation. Used in secret-key
 # hashing algorithms. Set this in your settings, or Plain will complain
 # loudly.
@@ -59,7 +73,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 = [
@@ -88,21 +102,9 @@ DATA_UPLOAD_MAX_NUMBER_FILES = 100
 # (i.e. "/tmp" on *nix systems).
 FILE_UPLOAD_TEMP_DIR = None
 
-USE_X_FORWARDED_HOST = False
-USE_X_FORWARDED_PORT = False
-
 # User-defined overrides for error views by status code
 HTTP_ERROR_VIEWS: dict[int] = {}
 
-# If your Plain app is behind a proxy that sets a header to specify secure
-# connections, AND that proxy ensures that user-submitted headers with the
-# same name are ignored (so that people can't spoof it), set this value to
-# a tuple of (header_name, header_value). For any requests that come in with
-# that header/value, request.is_https() will return True.
-# WARNING! Only set this if you fully understand what you're doing. Otherwise,
-# you may be opening yourself up to a security risk.
-SECURE_PROXY_SSL_HEADER = None
-
 ##############
 # MIDDLEWARE #
 ##############

{plain-0.8.0 → plain-0.11.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.0 → plain-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "plain"
-version = "0.8.0"
+version = "0.11.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]