pkn 0.1.0__tar.gz → 0.1.2__tar.gz

{pkn-0.1.0 → pkn-0.1.2}/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 timkpaine
+   Copyright 2024 the pkn authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

{pkn-0.1.0 → pkn-0.1.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pkn
-Version: 0.1.0
+Version: 0.1.2
 Summary: My Pocket Knife
-Project-URL: Repository, https://github.com/timkpaine/pkn
-Project-URL: Homepage, https://github.com/timkpaine/pkn
-Author-email: timkpaine <t.paine154@gmail.com>
+Project-URL: Repository, https://github.com/1kbgz/pkn
+Project-URL: Homepage, https://github.com/1kbgz/pkn
+Author-email: the pkn authors <t.paine154@gmail.com>
 License: Apache-2.0
 License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.9
-Requires-Dist: ccflow
 Requires-Dist: pydantic
 Provides-Extra: develop
 Requires-Dist: build; extra == 'develop'
@@ -28,6 +28,7 @@ Requires-Dist: pytest; extra == 'develop'
 Requires-Dist: pytest-cov; extra == 'develop'
 Requires-Dist: ruff; extra == 'develop'
 Requires-Dist: twine; extra == 'develop'
+Requires-Dist: uv; extra == 'develop'
 Requires-Dist: wheel; extra == 'develop'
 Description-Content-Type: text/markdown
 
@@ -35,11 +36,10 @@ Description-Content-Type: text/markdown
 
 My Pocket Knife
 
-[![Build Status](https://github.com/timkpaine/pkn/actions/workflows/build.yml/badge.svg?branch=main&event=push)](https://github.com/timkpaine/pkn/actions/workflows/build.yml)
-[![codecov](https://codecov.io/gh/timkpaine/pkn/branch/main/graph/badge.svg)](https://codecov.io/gh/timkpaine/pkn)
-[![License](https://img.shields.io/github/license/timkpaine/pkn)](https://github.com/timkpaine/pkn)
+[![Build Status](https://github.com/1kbgz/pkn/actions/workflows/build.yml/badge.svg?branch=main&event=push)](https://github.com/1kbgz/pkn/actions/workflows/build.yml)
+[![codecov](https://codecov.io/gh/1kbgz/pkn/branch/main/graph/badge.svg)](https://codecov.io/gh/1kbgz/pkn)
+[![License](https://img.shields.io/github/license/1kbgz/pkn)](https://github.com/1kbgz/pkn)
 [![PyPI](https://img.shields.io/pypi/v/pkn.svg)](https://pypi.python.org/pypi/pkn)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/timkpaine/pkn/main?urlpath=lab)
 
 ## Overview
 

pkn-0.1.2/README.md

@@ -0,0 +1,14 @@
+# pkn
+
+My Pocket Knife
+
+[![Build Status](https://github.com/1kbgz/pkn/actions/workflows/build.yml/badge.svg?branch=main&event=push)](https://github.com/1kbgz/pkn/actions/workflows/build.yml)
+[![codecov](https://codecov.io/gh/1kbgz/pkn/branch/main/graph/badge.svg)](https://codecov.io/gh/1kbgz/pkn)
+[![License](https://img.shields.io/github/license/1kbgz/pkn)](https://github.com/1kbgz/pkn)
+[![PyPI](https://img.shields.io/pypi/v/pkn.svg)](https://pypi.python.org/pypi/pkn)
+
+## Overview
+
+
+> [!NOTE]
+> This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).

pkn-0.1.2/pkn/__init__.py

@@ -0,0 +1,3 @@
+from .pydantic import *
+
+__version__ = "0.1.2"

{pkn-0.1.0 → pkn-0.1.2}/pkn/infra/common.py

@@ -1,6 +1,6 @@
 from typing import Literal
 
-from ccflow import BaseModel
+from pydantic import BaseModel
 
 SIZE_SUFFIX = Literal["B", "K", "M", "G", "T"]
 

{pkn-0.1.0 → pkn-0.1.2}/pkn/infra/journalctl.py

@@ -1,6 +1,6 @@
 from typing import Literal
 
-from ccflow import BaseModel
+from pydantic import BaseModel
 
 
 class JournalCtl(BaseModel):

{pkn-0.1.0 → pkn-0.1.2}/pkn/pydantic/roots.py

@@ -1,12 +1,12 @@
-from typing import Dict as DictType, List as ListType
+from typing import Dict as DictType, List as ListType, Optional, Union
 
-from pydantic import BaseModel, RootModel
+from pydantic import BaseModel, Field, RootModel
 
 __all__ = ("Dict", "List")
 
 
 class Dict(RootModel):
-    root: DictType[str, BaseModel]
+    root: Optional[DictType[str, Optional[Union[BaseModel, "Dict", "List", int, float, str]]]] = Field(default_factory=dict)
 
     def __iter__(self):
         return iter(self.root)
@@ -46,7 +46,7 @@ class Dict(RootModel):
 
 
 class List(RootModel):
-    root: ListType[BaseModel]
+    root: Optional[ListType[Union[BaseModel, "Dict", "List", int, float, str]]] = Field(default_factory=list)
 
     def __iter__(self):
         return iter(self.root)

{pkn-0.1.0 → pkn-0.1.2}/pkn/tests/pydantic/test_roots.py

@@ -27,6 +27,10 @@ class TestPydanticRoots:
         assert "a" not in d
         assert "b" not in d
 
+    def test_dict_types(self):
+        d = Dict({"a": MyModel(a=1, b="b"), "b": "abc", "c": 1, "d": 1.2, "e": List(), "f": Dict(), "g": None})
+        assert len(d) == 7
+
     def test_list(self):
         lst = List([MyModel(a=1, b="b"), MyModel(a=2, b="c")])
         assert len(lst) == 2
@@ -37,3 +41,7 @@ class TestPydanticRoots:
         del lst[0]
         assert len(lst) == 1
         assert lst[0] == MyModel(a=2, b="c")
+
+    def test_list_types(self):
+        d = List([MyModel(a=1, b="b"), "abc", 1, 1.2, List(), Dict(), None])
+        assert len(d) == 7

{pkn-0.1.0 → pkn-0.1.2}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend="hatchling.build"
 
 [project]
 name = "pkn"
-authors = [{name = "timkpaine", email = "t.paine154@gmail.com"}]
+authors = [{name = "the pkn authors", email = "t.paine154@gmail.com"}]
 description = "My Pocket Knife"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.1.0"
+version = "0.1.2"
 requires-python = ">=3.9"
 keywords = []
 
@@ -22,10 +22,10 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 dependencies = [
-    "ccflow",
     "pydantic",
 ]
 
@@ -39,17 +39,18 @@ develop = [
     "pytest-cov",
     "ruff",
     "twine",
+    "uv",
     "wheel",
 ]
 
 [project.scripts]
 
 [project.urls]
-Repository = "https://github.com/timkpaine/pkn"
-Homepage = "https://github.com/timkpaine/pkn"
+Repository = "https://github.com/1kbgz/pkn"
+Homepage = "https://github.com/1kbgz/pkn"
 
 [tool.bumpversion]
-current_version = "0.1.0"
+current_version = "0.1.2"
 commit = true
 tag = true
 
@@ -100,7 +101,6 @@ packages = ["pkn"]
 
 [tool.pytest.ini_options]
 addopts = ["-vvv", "--junitxml=junit.xml"]
-asyncio_mode = "strict"
 testpaths = "pkn/tests"
 
 [tool.ruff]

pkn-0.1.0/README.md

@@ -1,15 +0,0 @@
-# pkn
-
-My Pocket Knife
-
-[![Build Status](https://github.com/timkpaine/pkn/actions/workflows/build.yml/badge.svg?branch=main&event=push)](https://github.com/timkpaine/pkn/actions/workflows/build.yml)
-[![codecov](https://codecov.io/gh/timkpaine/pkn/branch/main/graph/badge.svg)](https://codecov.io/gh/timkpaine/pkn)
-[![License](https://img.shields.io/github/license/timkpaine/pkn)](https://github.com/timkpaine/pkn)
-[![PyPI](https://img.shields.io/pypi/v/pkn.svg)](https://pypi.python.org/pypi/pkn)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/timkpaine/pkn/main?urlpath=lab)
-
-## Overview
-
-
-> [!NOTE]
-> This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).

pkn-0.1.0/pkn/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"