From fe93853ac23fe5d6f7a06e2fd2ca8170cc98a479 Mon Sep 17 00:00:00 2001 From: wrmsr Date: Fri, 10 Jan 2025 12:14:24 -0500 Subject: [PATCH] 2025-01-10T17:14:24Z --- .pkg/omdev-cext/pyproject.toml | 4 ++-- .pkg/omdev-cli/pyproject.toml | 4 ++-- .pkg/omdev/pyproject.toml | 4 ++-- .pkg/ominfra/pyproject.toml | 8 ++++---- .pkg/omlish/pyproject.toml | 2 +- .pkg/ommlx/pyproject.toml | 6 +++--- .pkg/omserv/pyproject.toml | 4 ++-- omlish/__about__.py | 2 +- omlish/dataclasses/__init__.py | 2 ++ 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.pkg/omdev-cext/pyproject.toml b/.pkg/omdev-cext/pyproject.toml index 5ae4e8fe7..ded7ee250 100644 --- a/.pkg/omdev-cext/pyproject.toml +++ b/.pkg/omdev-cext/pyproject.toml @@ -12,7 +12,7 @@ authors = [ urls = {source = 'https://github.com/wrmsr/omlish'} license = {text = 'BSD-3-Clause'} requires-python = '>=3.12' -version = '0.0.0.dev205' +version = '0.0.0.dev206' classifiers = [ 'License :: OSI Approved :: BSD License', 'Development Status :: 2 - Pre-Alpha', @@ -22,7 +22,7 @@ classifiers = [ ] description = 'omdev' dependencies = [ - 'omdev == 0.0.0.dev205', + 'omdev == 0.0.0.dev206', ] [tool.setuptools] diff --git a/.pkg/omdev-cli/pyproject.toml b/.pkg/omdev-cli/pyproject.toml index fbb14ce15..22084dd29 100644 --- a/.pkg/omdev-cli/pyproject.toml +++ b/.pkg/omdev-cli/pyproject.toml @@ -12,7 +12,7 @@ authors = [ urls = {source = 'https://github.com/wrmsr/omlish'} license = {text = 'BSD-3-Clause'} requires-python = '>=3.12' -version = '0.0.0.dev205' +version = '0.0.0.dev206' classifiers = [ 'License :: OSI Approved :: BSD License', 'Development Status :: 2 - Pre-Alpha', @@ -22,7 +22,7 @@ classifiers = [ ] description = 'omdev' dependencies = [ - 'omdev == 0.0.0.dev205', + 'omdev == 0.0.0.dev206', ] [project.scripts] diff --git a/.pkg/omdev/pyproject.toml b/.pkg/omdev/pyproject.toml index cb75654a0..75fb33cf4 100644 --- a/.pkg/omdev/pyproject.toml +++ b/.pkg/omdev/pyproject.toml @@ -12,7 +12,7 @@ authors = [ urls = {source = 'https://github.com/wrmsr/omlish'} license = {text = 'BSD-3-Clause'} requires-python = '>=3.12' -version = '0.0.0.dev205' +version = '0.0.0.dev206' classifiers = [ 'License :: OSI Approved :: BSD License', 'Development Status :: 2 - Pre-Alpha', @@ -22,7 +22,7 @@ classifiers = [ ] description = 'omdev' dependencies = [ - 'omlish == 0.0.0.dev205', + 'omlish == 0.0.0.dev206', ] [project.optional-dependencies] diff --git a/.pkg/ominfra/pyproject.toml b/.pkg/ominfra/pyproject.toml index ed032da4e..aea35857c 100644 --- a/.pkg/ominfra/pyproject.toml +++ b/.pkg/ominfra/pyproject.toml @@ -12,7 +12,7 @@ authors = [ urls = {source = 'https://github.com/wrmsr/omlish'} license = {text = 'BSD-3-Clause'} requires-python = '>=3.12' -version = '0.0.0.dev205' +version = '0.0.0.dev206' classifiers = [ 'License :: OSI Approved :: BSD License', 'Development Status :: 2 - Pre-Alpha', @@ -22,9 +22,9 @@ classifiers = [ ] description = 'ominfra' dependencies = [ - 'omdev == 0.0.0.dev205', - 'omlish == 0.0.0.dev205', - 'omserv == 0.0.0.dev205', + 'omdev == 0.0.0.dev206', + 'omlish == 0.0.0.dev206', + 'omserv == 0.0.0.dev206', ] [project.optional-dependencies] diff --git a/.pkg/omlish/pyproject.toml b/.pkg/omlish/pyproject.toml index 18d44fc8d..83410b118 100644 --- a/.pkg/omlish/pyproject.toml +++ b/.pkg/omlish/pyproject.toml @@ -12,7 +12,7 @@ authors = [ urls = {source = 'https://github.com/wrmsr/omlish'} license = {text = 'BSD-3-Clause'} requires-python = '>=3.12' -version = '0.0.0.dev205' +version = '0.0.0.dev206' classifiers = [ 'License :: OSI Approved :: BSD License', 'Development Status :: 2 - Pre-Alpha', diff --git a/.pkg/ommlx/pyproject.toml b/.pkg/ommlx/pyproject.toml index e00eab99e..794c956e0 100644 --- a/.pkg/ommlx/pyproject.toml +++ b/.pkg/ommlx/pyproject.toml @@ -12,7 +12,7 @@ authors = [ urls = {source = 'https://github.com/wrmsr/omlish'} license = {text = 'BSD-3-Clause'} requires-python = '>=3.12' -version = '0.0.0.dev205' +version = '0.0.0.dev206' classifiers = [ 'License :: OSI Approved :: BSD License', 'Development Status :: 2 - Pre-Alpha', @@ -22,8 +22,8 @@ classifiers = [ ] description = 'ommlx' dependencies = [ - 'omdev == 0.0.0.dev205', - 'omlish == 0.0.0.dev205', + 'omdev == 0.0.0.dev206', + 'omlish == 0.0.0.dev206', ] [project.optional-dependencies] diff --git a/.pkg/omserv/pyproject.toml b/.pkg/omserv/pyproject.toml index 39761a1dd..4ce146c9b 100644 --- a/.pkg/omserv/pyproject.toml +++ b/.pkg/omserv/pyproject.toml @@ -12,7 +12,7 @@ authors = [ urls = {source = 'https://github.com/wrmsr/omlish'} license = {text = 'BSD-3-Clause'} requires-python = '>=3.12' -version = '0.0.0.dev205' +version = '0.0.0.dev206' classifiers = [ 'License :: OSI Approved :: BSD License', 'Development Status :: 2 - Pre-Alpha', @@ -22,7 +22,7 @@ classifiers = [ ] description = 'omserv' dependencies = [ - 'omlish == 0.0.0.dev205', + 'omlish == 0.0.0.dev206', ] [project.optional-dependencies] diff --git a/omlish/__about__.py b/omlish/__about__.py index 571afc323..60637f9dc 100644 --- a/omlish/__about__.py +++ b/omlish/__about__.py @@ -1,4 +1,4 @@ -__version__ = '0.0.0.dev205' +__version__ = '0.0.0.dev206' __revision__ = None diff --git a/omlish/dataclasses/__init__.py b/omlish/dataclasses/__init__.py index 0f5d3cffc..059090f9c 100644 --- a/omlish/dataclasses/__init__.py +++ b/omlish/dataclasses/__init__.py @@ -71,6 +71,8 @@ ) from .impl.metadata import ( # noqa + Metadata, + get_merged_metadata, UserMetadata,