plain.dev 0.14.1__py3-none-any.whl → 0.15.0__py3-none-any.whl

plain/dev/README.md

@@ -58,7 +58,7 @@ Runs:
 
 - Custom commands defined in `pyproject.toml` at `tool.plain.pre-commit.run`
 - `plain code check`, if [`plain.code`](https://plainframework.com/docs/plain-code/plain/code/) is installed
-- `poetry check --lock`, if using [Poetry](https://python-poetry.org/)
+- `uv lock --locked`, if using uv
 - `plain preflight --database default`
 - `plain migrate --check`
 - `plain makemigrations --dry-run --check`

plain/dev/cli.py

@@ -4,12 +4,13 @@ import os
 import platform
 import subprocess
 import sys
+import tomllib
 from importlib.metadata import entry_points
 from importlib.util import find_spec
 from pathlib import Path
 
 import click
-import tomllib
+from rich.console import Console
 
 from plain.runtime import APP_PATH, settings
 
@@ -17,6 +18,7 @@ from .db import cli as db_cli
 from .mkcert import MkcertManager
 from .pid import Pid
 from .poncho.manager import Manager as PonchoManager
+from .poncho.printer import Printer
 from .services import Services
 from .utils import has_pyproject_toml
 
@@ -91,8 +93,6 @@ class Dev:
         self.hostname = hostname
         self.log_level = log_level
 
-        self.poncho = PonchoManager()
-
         self.ssl_key_path = None
         self.ssl_cert_path = None
 
@@ -110,6 +110,9 @@ class Dev:
             "PLAIN_DEV_URL": self.url,
         }
 
+        self.console = Console(markup=False, highlight=False)
+        self.poncho = PonchoManager(printer=Printer(lambda s: self.console.out(s)))
+
     def run(self):
         pid = Pid()
         pid.write()
@@ -133,15 +136,10 @@ class Dev:
             self.add_pyproject_run()
             self.add_services()
 
-            # Output the clickable link before starting the manager loop
-            click.secho(
-                f"\nYour app will run at: {click.style(self.url, fg='green', underline=True)}\n",
-                bold=True,
-            )
-
-            click.secho("Starting services (Ctrl+C to stop):", italic=True, dim=True)
+            click.secho("\nStarting services (Ctrl+C to stop):", italic=True, dim=True)
 
-            self.poncho.loop()
+            with self.console.status(self.url):
+                self.poncho.loop()
 
             return self.poncho.returncode
         finally:

plain/dev/contribute/cli.py

@@ -7,11 +7,14 @@ import click
 
 @click.command("contribute")
 @click.option("--repo", default="../plain", help="Path to the plain repo")
+@click.option(
+    "--reset", is_flag=True, help="Undo any changes to pyproject.toml and uv.lock"
+)
 @click.argument("packages", nargs=-1)
-def cli(packages, repo):
+def cli(packages, repo, reset):
     """Contribute to plain by linking packages locally."""
 
-    if "reset" in packages:
+    if reset:
         click.secho("Undoing any changes to pyproject.toml and uv.lock", bold=True)
         result = subprocess.run(["git", "checkout", "pyproject.toml", "uv.lock"])
         if result.returncode:

plain/dev/poncho/compat.py

@@ -2,6 +2,7 @@
 Compatibility layer and utilities, mostly for proper Windows and Python 3
 support.
 """
+
 import errno
 import os
 import signal

plain/dev/poncho/manager.py

@@ -91,7 +91,7 @@ class Manager:
         """
 
         def _terminate(signum, frame):
-            self._system_print("%s received\n" % SIGNALS[signum]["name"])
+            self._system_print("{} received\n".format(SIGNALS[signum]["name"]))
             self.returncode = SIGNALS[signum]["rc"]
             self.terminate()
 

plain/dev/poncho/printer.py

@@ -1,8 +1,5 @@
-import sys
 from collections import namedtuple
 
-from .compat import ON_WINDOWS
-
 Message = namedtuple("Message", "type data time name color")
 
 
@@ -15,27 +12,18 @@ class Printer:
 
     def __init__(
         self,
-        output=sys.stdout,
+        print_func,
         time_format="%H:%M:%S",
         width=0,
         color=True,
         prefix=True,
     ):
-        self.output = output
+        self.print_func = print_func
         self.time_format = time_format
         self.width = width
         self.color = color
         self.prefix = prefix
 
-        try:
-            # We only want to print colored messages if the given output supports
-            # ANSI escape sequences. Usually, testing if it is a TTY is safe enough.
-            self._colors_supported = self.output.isatty()
-        except AttributeError:
-            # If the given output does not implement isatty(), we assume that it
-            # is not able to handle ANSI escape sequences.
-            self._colors_supported = False
-
     def write(self, message):
         if message.type != "line":
             raise RuntimeError('Printer can only process messages of type "line"')
@@ -58,28 +46,14 @@ class Printer:
             if self.prefix:
                 time_formatted = message.time.strftime(self.time_format)
                 prefix = f"{time_formatted} {name}| "
-                if self.color and self._colors_supported and message.color:
+                if self.color and message.color:
                     prefix = _color_string(message.color, prefix)
-            print(prefix + line, file=self.output, flush=True)
 
-
-def _ansi(code):
-    return f"\033[{code}m"
+            self.print_func(prefix + line)
 
 
 def _color_string(color, s):
-    return f"{_ansi(0)}{_ansi(color)}{s}{_ansi(0)}"
+    def _ansi(code):
+        return f"\033[{code}m"
 
-
-if ON_WINDOWS:
-    # The colorama package provides transparent support for ANSI color codes
-    # on Win32 platforms. We try and import and configure that, but fall back
-    # to no color if we fail.
-    try:
-        import colorama
-    except ImportError:
-
-        def _color_string(color, s):
-            return s
-    else:
-        colorama.init()
+    return f"{_ansi(0)}{_ansi(color)}{s}{_ansi(0)}"

plain/dev/precommit/cli.py

@@ -1,11 +1,11 @@
 import os
 import subprocess
 import sys
+import tomllib
 from importlib.util import find_spec
 from pathlib import Path
 
 import click
-import tomllib
 
 from plain.cli.print import print_event
 
@@ -56,8 +56,8 @@ def cli(install):
         if find_spec("plain.code"):
             check_short("Running plain code checks", "plain", "code", "check")
 
-        if Path("poetry.lock").exists():
-            check_short("Checking poetry.lock", "poetry", "check", "--lock")
+        if Path("uv.lock").exists():
+            check_short("Checking uv.lock", "uv", "lock", "--locked")
 
         if plain_db_connected():
             check_short(

plain/dev/services.py

@@ -1,11 +1,11 @@
 import os
 import subprocess
 import time
+import tomllib
 from importlib.util import find_spec
 from pathlib import Path
 
 import click
-import tomllib
 
 from plain.runtime import APP_PATH
 

{plain_dev-0.14.1.dist-info → plain_dev-0.15.0.dist-info}/METADATA

@@ -1,26 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: plain.dev
-Version: 0.14.1
+Version: 0.15.0
 Summary: Local development tools for Plain.
-Home-page: https://plainframework.com
-License: BSD-3-Clause
-Author: Dave Gaeddert
-Author-email: dave.gaeddert@dropseed.dev
-Requires-Python: >=3.11,<4.0
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: click (>=8.0.0)
-Requires-Dist: debugpy (>=1.6.3,<2.0.0)
-Requires-Dist: gunicorn (>20)
-Requires-Dist: plain (<1.0.0)
-Requires-Dist: psycopg[binary] (>=3.2.2,<4.0.0)
-Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
-Requires-Dist: requests (>=2.0.0)
-Project-URL: Documentation, https://plainframework.com/docs/
-Project-URL: Repository, https://github.com/dropseed/plain
+Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
+License-Expression: BSD-3-Clause
+License-File: LICENSE
+Requires-Python: >=3.11
+Requires-Dist: click>=8.0.0
+Requires-Dist: debugpy~=1.6.3
+Requires-Dist: gunicorn>20
+Requires-Dist: plain<1.0.0
+Requires-Dist: psycopg[binary]~=3.2.2
+Requires-Dist: python-dotenv~=1.0.0
+Requires-Dist: requests>=2.0.0
+Requires-Dist: rich
 Description-Content-Type: text/markdown
 
 <!-- This file is compiled from plain-dev/plain/dev/README.md. Do not edit this file directly. -->
@@ -85,7 +78,7 @@ Runs:
 
 - Custom commands defined in `pyproject.toml` at `tool.plain.pre-commit.run`
 - `plain code check`, if [`plain.code`](https://plainframework.com/docs/plain-code/plain/code/) is installed
-- `poetry check --lock`, if using [Poetry](https://python-poetry.org/)
+- `uv lock --locked`, if using uv
 - `plain preflight --database default`
 - `plain migrate --check`
 - `plain makemigrations --dry-run --check`
@@ -121,4 +114,3 @@ class HomeView(TemplateView):
 When you load the page, you'll see "Waiting for debugger to attach...".
 
 You can then run the VS Code debugger and attach to an existing Python process, at localhost:5678.
-

{plain_dev-0.14.1.dist-info → plain_dev-0.15.0.dist-info}/RECORD

@@ -1,33 +1,33 @@
-plain/dev/README.md,sha256=BQDaRKfsafIPzx7vtVt-zS-a8l6sxbQThhQTvu7tp3Y,3699
+plain/dev/README.md,sha256=-yR4qzwEP7vDVvCAHJ22aaQHQ7rXVW9uy0KEZjCzmz4,3662
 plain/dev/__init__.py,sha256=C1JrkNE5XX2DLgBXXLAV_UyhofwVd0ZPL59fPUMbOKo,139
-plain/dev/cli.py,sha256=4JHTRxMvUcpoZNBah2ZEWTZF6KarEi6M51kSBdw-BMQ,10612
-plain/dev/contribute/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/contribute/cli.py,sha256=vrHSYM0Y2XtIUbxmNcJqssoPN-ZbkH4T_p65NVkYrV4,2339
-plain/dev/db/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/db/cli.py,sha256=058HjRKLGz-FxauQEpwsPoh_LCiy-_NEIpRZl9W1ZKM,2855
-plain/dev/db/container.py,sha256=RlPJU_CCMKA-zN8Kp0sYAu3jabOizxYAj8fSCsjCf60,5147
+plain/dev/cli.py,sha256=3vA6ekQ3WdXFMst6TLeT982mUb3EiSsBkCnTZcSU5Gc,10605
 plain/dev/debug.py,sha256=fIrecLfAK_lXSDyn3WmYikzZSse3KY47xcVVbZqJGhk,294
 plain/dev/default_settings.py,sha256=uXWYORWP_aRDwXIFXdu5kHyiBFUZzARIJdhPeFaX35c,75
 plain/dev/entrypoints.py,sha256=qBTP2A9pgxQmZ9hGV0OiBL92v9wa7TeJdOXnKZcX6AE,81
 plain/dev/gunicorn_logging.json,sha256=yU23jzs5G4YGdDWBNiyAc3KypR4HirR6afIkD7w6DhU,1113
 plain/dev/mkcert.py,sha256=u284XXQeTgwSkKKh0gMrYpnNGdd9OOUJKLQAXcvGnr4,3459
 plain/dev/pid.py,sha256=gRMBf7aGndrra1TnmKtPghTijnd0i0Xeo63mzfPWp7M,436
+plain/dev/requests.py,sha256=v4ucDL8d6I0s5kF8O8HRvSc6Snq1Z_SMQv7wGGAI_Us,6847
+plain/dev/services.py,sha256=26WnVNjNAh37BA-wHQSGQY_9Ofw8oGgJdHhxnFaSKkg,2059
+plain/dev/urls.py,sha256=b4NL2I6Ok-t7nTPjRnKoz_LQRttE3_mp8l2NlmeYQ9I,146
+plain/dev/utils.py,sha256=4wMzpvj1Is_c0QxhsTu34_P9wAYlzw4glNPfVtZr_0A,123
+plain/dev/views.py,sha256=r2Ivk7OXytpRhXq4DZpsb7FXNP9vzmEE3D5kLajYG4w,1073
+plain/dev/contribute/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
+plain/dev/contribute/cli.py,sha256=mIK4u1rhee8iMovUpuHTNjfWolqNgS24_gTb8ZaSY-8,2432
+plain/dev/db/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
+plain/dev/db/cli.py,sha256=058HjRKLGz-FxauQEpwsPoh_LCiy-_NEIpRZl9W1ZKM,2855
+plain/dev/db/container.py,sha256=RlPJU_CCMKA-zN8Kp0sYAu3jabOizxYAj8fSCsjCf60,5147
 plain/dev/poncho/__init__.py,sha256=MDOk2rhhoR3V-I-rg6tMHFeX60vTGJuQ14RI-_N6tQY,97
 plain/dev/poncho/color.py,sha256=Dk77inPR9qNc9vCaZOGk8W9skXfRgoUlxp_E6mhPNns,610
-plain/dev/poncho/compat.py,sha256=YzioS5fuzUl6j55fzgvhsU6TS_IdegMtv7FUSUU6sBQ,1275
-plain/dev/poncho/manager.py,sha256=UaC4Qlejy4tVAz_6z5J4Auu5PZBW1pUuo9hUMfIMSFQ,6360
-plain/dev/poncho/printer.py,sha256=KSkSXx6KiejekJ9e4bzutIAIL8oZPDGimtVHNRJyFbQ,2671
+plain/dev/poncho/compat.py,sha256=l66WZLR7kRpO8P8DI5-aUsbNlohPaXEurQ5xXESQYDs,1276
+plain/dev/poncho/manager.py,sha256=l_m_RhNTF9Fs6p0Tk8pdjd5ZxQxU1kbGEgDD-qJaFGs,6366
+plain/dev/poncho/printer.py,sha256=wt1ioaGcPnVyrPy-UjvdsR9zfcr4DTTycmapW1MIdSU,1785
 plain/dev/poncho/process.py,sha256=JJOKy-C6vMCg7-6JMCtu6C649h7HmOBSJqDP_hnX49I,2637
 plain/dev/precommit/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/precommit/cli.py,sha256=UNrQmWRKrkZ6WbzrrcnjZl8VHwNorOVTHGoRQsR4jp8,3422
-plain/dev/requests.py,sha256=v4ucDL8d6I0s5kF8O8HRvSc6Snq1Z_SMQv7wGGAI_Us,6847
-plain/dev/services.py,sha256=XwtMpTjyZzEB8RVgjRuW9PRMQSTuhUAN-zY4Kl_kSZY,2059
+plain/dev/precommit/cli.py,sha256=D_A5Mk2eXqjJDSUE6qyCFFddhM7wBZR3C9hgkDRx_v8,3411
 plain/dev/templates/dev/requests.html,sha256=kQKJZq5L77juuL_t8UjcAehEU61U4RXNnKaAET-wAm8,7627
-plain/dev/urls.py,sha256=b4NL2I6Ok-t7nTPjRnKoz_LQRttE3_mp8l2NlmeYQ9I,146
-plain/dev/utils.py,sha256=4wMzpvj1Is_c0QxhsTu34_P9wAYlzw4glNPfVtZr_0A,123
-plain/dev/views.py,sha256=r2Ivk7OXytpRhXq4DZpsb7FXNP9vzmEE3D5kLajYG4w,1073
-plain_dev-0.14.1.dist-info/LICENSE,sha256=YDg-l_Rj7LVP5uDXy04eQPGb_DYVXAHAHYd9r3pU1Cg,2713
-plain_dev-0.14.1.dist-info/METADATA,sha256=3O2OFs2HpjrG8Iv3U6CAJYJAR9yCk7Q2j6-lcRvp7gw,4722
-plain_dev-0.14.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-plain_dev-0.14.1.dist-info/entry_points.txt,sha256=1FaE_73k95WYOJrmB0hcHBnEIFQa-Cfl56Z1LGxyvak,164
-plain_dev-0.14.1.dist-info/RECORD,,
+plain_dev-0.15.0.dist-info/METADATA,sha256=Im1HdbGL3G1q1WEh5eI2i-zxtsh5SUtsVVGQTSgfR5s,4274
+plain_dev-0.15.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_dev-0.15.0.dist-info/entry_points.txt,sha256=jncRPB4B7d27YWkzWqzt68y534ntliHPNukv_kQu5KY,171
+plain_dev-0.15.0.dist-info/licenses/LICENSE,sha256=YDg-l_Rj7LVP5uDXy04eQPGb_DYVXAHAHYd9r3pU1Cg,2713
+plain_dev-0.15.0.dist-info/RECORD,,

{plain_dev-0.14.1.dist-info → plain_dev-0.15.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

plain_dev-0.15.0.dist-info/entry_points.txt

@@ -0,0 +1,7 @@
+[plain.cli]
+contrib = plain.dev.contribute:cli
+dev = plain.dev:cli
+pre-commit = plain.dev.precommit:cli
+
+[plain.setup]
+dev-dotenv = plain.dev.entrypoints:load_dotenv_file

plain_dev-0.14.1.dist-info/entry_points.txt

@@ -1,8 +0,0 @@
-[plain.cli]
-contrib=plain.dev.contribute:cli
-dev=plain.dev:cli
-pre-commit=plain.dev.precommit:cli
-
-[plain.setup]
-dev-dotenv=plain.dev.entrypoints:load_dotenv_file
-