Merge pull request #116 from vkottler/dev/2.7.1

2.7.1 - Fix enum name regex
vkottler · Sep 13, 2023 · db81339 · db81339
2 parents b03cad0 + 142372a
commit db81339
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -68,7 +68,7 @@ jobs:
 
       - run: |
           mk python-release owner=vkottler \
-                            repo=runtimepy version=2.7.0
+                            repo=runtimepy version=2.7.1
         if: |
           matrix.python-version == '3.11'
           && matrix.system == 'ubuntu-latest'

diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.3
-    hash=13de77cea2a96abdf252103ade6dd6db
+    hash=a72da168f214fb625163824388549911
     =====================================
 -->
 
-# runtimepy ([2.7.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([2.7.1](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)

diff --git a/local/variables/package.yaml b/local/variables/package.yaml
@@ -1,5 +1,5 @@
 ---
 major: 2
 minor: 7
-patch: 0
+patch: 1
 entry: runtimepy
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "runtimepy"
-version = "2.7.0"
+version = "2.7.1"
 description = "A framework for implementing Python services."
 readme = "README.md"
 requires-python = ">=3.10"

diff --git a/runtimepy/__init__.py b/runtimepy/__init__.py
@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.3
-# hash=b6c52ca304f4e018893aa3811b36d6af
+# hash=962f3227b7f0033ff39fbfa1a78060f5
 # =====================================
 
 """
@@ -10,7 +10,7 @@
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "2.7.0"
+VERSION = "2.7.1"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"
diff --git a/runtimepy/mixins/regex.py b/runtimepy/mixins/regex.py
@@ -7,8 +7,8 @@
 from re import Pattern as _Pattern
 from re import compile as _compile
 
-DEFAULT_PATTERN = _compile("^[\\w\\:-_.]+$")
-CHANNEL_PATTERN = _compile("^[a-z0-9-_.]+$")
+DEFAULT_PATTERN = _compile("^[\\w\\:.-]+$")
+CHANNEL_PATTERN = _compile("^[a-z0-9_.-]+$")
 
 
 class RegexMixin:

diff --git a/tests/enum/test_registry.py b/tests/enum/test_registry.py
@@ -82,3 +82,8 @@ def test_enum_registry_basic():
         enums.encode(tmp)
         new_enums = EnumRegistry.decode(tmp)
         assert enums == new_enums
+
+    # Test a name expected to be valid.
+    assert enums.register_dict(
+        "sharer.actuator-1.control_mode.cmd", {"type": "int", "items": {}}
+    )