Merge pull request #47 from vkottler/dev/1.3.3

1.3.3 - Small fixes

.github/workflows/python-package.yml

@@ -54,7 +54,7 @@ jobs:
         env:
           PY_TEST_EXTRA_ARGS: --cov-report=xml
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v3.1.5
 
       - run: mk pypi-upload-ci
         env:
@@ -67,7 +67,7 @@ jobs:
 
       - run: |
           mk python-release owner=vkottler \
-                            repo=conntextual version=1.3.2
+                            repo=conntextual version=1.3.3
         if: |
           matrix.python-version == '3.11'
           && matrix.system == 'ubuntu-latest'

.gitignore

@@ -15,3 +15,4 @@ coverage*.xml
 tags
 mklocal
 docs
+src

README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.4
-    hash=a9a30cf429a319b9952628f5e462ff40
+    hash=8b302ab6c9f0ef6558a1aeb77a875edb
     =====================================
 -->
 
-# conntextual ([1.3.2](https://pypi.org/project/conntextual/))
+# conntextual ([1.3.3](https://pypi.org/project/conntextual/))
 
 [![python](https://img.shields.io/pypi/pyversions/conntextual.svg)](https://pypi.org/project/conntextual/)
 ![Build Status](https://github.com/vkottler/conntextual/workflows/Python%20Package/badge.svg)
@@ -44,7 +44,7 @@ This package is tested on the following platforms:
 # Command-line Options
 
 ```
-$ ./venv3.11/bin/conntextual -h
+$ ./venv3.12/bin/conntextual -h
 
 usage: conntextual [-h] [--version] [-v] [-q] [--curses] [--no-uvloop]
                    [-C DIR]

conntextual/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=5a5bf6bcbb4a7b41af6399988074b404
+# hash=010f2975307c5e47995ef4bb32c47caf
 # =====================================
 
 """
@@ -10,4 +10,4 @@
 
 DESCRIPTION = "A network-application TUI using textual."
 PKG_NAME = "conntextual"
-VERSION = "1.3.2"
+VERSION = "1.3.3"

conntextual/data/sample.yaml

@@ -1,6 +1,3 @@
 ---
-factories:
-  - {name: conntextual.ui.sample.Sample}
-
 tasks:
   - {name: sample, factory: Sample, period_s: 0.2}

conntextual/ui/channel/color.py

@@ -7,7 +7,7 @@
 
 # third-party
 from runtimepy.enum import RuntimeEnum
-from runtimepy.primitives.type import AnyPrimitiveType
+from runtimepy.primitives.types import AnyPrimitiveType
 from textual._color_constants import COLOR_NAME_TO_RGB
 from textual.color import Color
 

conntextual/ui/channel/environment.py

@@ -9,7 +9,9 @@
 # third-party
 from rich.text import Text
 from runtimepy.channel import AnyChannel
-from runtimepy.channel.environment.command import ChannelCommandProcessor
+from runtimepy.channel.environment.command.processor import (
+    ChannelCommandProcessor,
+)
 from runtimepy.enum import RuntimeEnum
 from runtimepy.net.arbiter import AppInfo
 from runtimepy.registry.name import RegistryKey

conntextual/ui/channel/model.py

@@ -8,7 +8,9 @@
 
 # third-party
 from runtimepy.channel.environment import ChannelEnvironment
-from runtimepy.channel.environment.command import ChannelCommandProcessor
+from runtimepy.channel.environment.command.processor import (
+    ChannelCommandProcessor,
+)
 from runtimepy.net.arbiter import AppInfo
 from vcorelib.logging import LoggerType
 

conntextual/ui/channel/suggester.py

@@ -7,7 +7,9 @@
 from typing import Optional
 
 # third-party
-from runtimepy.channel.environment.command import ChannelCommandProcessor
+from runtimepy.channel.environment.command.processor import (
+    ChannelCommandProcessor,
+)
 from textual.suggester import Suggester
 
 

local/variables/package.yaml

@@ -1,5 +1,5 @@
 ---
 major: 1
 minor: 3
-patch: 2
+patch: 3
 entry: conntextual

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "conntextual"
-version = "1.3.2"
+version = "1.3.3"
 description = "A network-application TUI using textual."
 readme = "README.md"
 requires-python = ">=3.11"

tasks/conf.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=9f62028523c3b5a953733ca89dcc3018
+# hash=7d378a1752611508007a77d4ca39a5af
 # =====================================
 """
 A module for project-specific task registration.
@@ -20,14 +20,9 @@ def audit_local_tasks() -> None:
     """Ensure that shared task infrastructure is present."""
 
     local = Path(__file__).parent.joinpath("mklocal")
-
-    # Also link a top-level file.
     top_level = local.parent.parent.joinpath("mklocal")
-    if not top_level.is_symlink():
-        assert not top_level.exists()
-        top_level.symlink_to(local)
 
-    if local.is_symlink():
+    if local.is_symlink() and top_level.is_symlink():
         return
 
     # If it's not a symlink, it shouldn't be any other kind of file.
@@ -48,6 +43,11 @@ def audit_local_tasks() -> None:
     # Create the link.
     local.symlink_to(vmklib)
 
+    # Also link a top-level file.
+    if not top_level.is_symlink():
+        assert not top_level.exists()
+        top_level.symlink_to(local)
+
 
 def register(
     manager: TaskManager,