diff --git a/jsonschema_pydantic/__init__.py b/jambo/__init__.py similarity index 100% rename from jsonschema_pydantic/__init__.py rename to jambo/__init__.py diff --git a/jsonschema_pydantic/schema_converter.py b/jambo/schema_converter.py similarity index 96% rename from jsonschema_pydantic/schema_converter.py rename to jambo/schema_converter.py index ff1b90f..e2f4fe9 100644 --- a/jsonschema_pydantic/schema_converter.py +++ b/jambo/schema_converter.py @@ -1,11 +1,10 @@ -from jsonschema_pydantic.types import GenericTypeParser +from jambo.types import GenericTypeParser from jsonschema.exceptions import SchemaError from jsonschema.protocols import Validator from pydantic import create_model from pydantic.fields import Field -import warnings from typing import Type diff --git a/jsonschema_pydantic/types/__init__.py b/jambo/types/__init__.py similarity index 100% rename from jsonschema_pydantic/types/__init__.py rename to jambo/types/__init__.py diff --git a/jsonschema_pydantic/types/_type_parser.py b/jambo/types/_type_parser.py similarity index 100% rename from jsonschema_pydantic/types/_type_parser.py rename to jambo/types/_type_parser.py diff --git a/jsonschema_pydantic/types/array_type_parser.py b/jambo/types/array_type_parser.py similarity index 85% rename from jsonschema_pydantic/types/array_type_parser.py rename to jambo/types/array_type_parser.py index ca19828..328a6d4 100644 --- a/jsonschema_pydantic/types/array_type_parser.py +++ b/jambo/types/array_type_parser.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.types._type_parser import GenericTypeParser +from jambo.types._type_parser import GenericTypeParser from typing import TypeVar diff --git a/jsonschema_pydantic/types/boolean_type_parser.py b/jambo/types/boolean_type_parser.py similarity index 73% rename from jsonschema_pydantic/types/boolean_type_parser.py rename to jambo/types/boolean_type_parser.py index 5e69c39..2af98fb 100644 --- a/jsonschema_pydantic/types/boolean_type_parser.py +++ b/jambo/types/boolean_type_parser.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.types._type_parser import GenericTypeParser +from jambo.types._type_parser import GenericTypeParser class BooleanTypeParser(GenericTypeParser): diff --git a/jsonschema_pydantic/types/float_type_parser.py b/jambo/types/float_type_parser.py similarity index 73% rename from jsonschema_pydantic/types/float_type_parser.py rename to jambo/types/float_type_parser.py index 950e7d1..f10f3e3 100644 --- a/jsonschema_pydantic/types/float_type_parser.py +++ b/jambo/types/float_type_parser.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.types._type_parser import GenericTypeParser +from jambo.types._type_parser import GenericTypeParser class FloatTypeParser(GenericTypeParser): diff --git a/jsonschema_pydantic/types/int_type_parser.py b/jambo/types/int_type_parser.py similarity index 72% rename from jsonschema_pydantic/types/int_type_parser.py rename to jambo/types/int_type_parser.py index ac5bb6d..121bdd4 100644 --- a/jsonschema_pydantic/types/int_type_parser.py +++ b/jambo/types/int_type_parser.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.types._type_parser import GenericTypeParser +from jambo.types._type_parser import GenericTypeParser class IntTypeParser(GenericTypeParser): diff --git a/jsonschema_pydantic/types/object_type_parser.py b/jambo/types/object_type_parser.py similarity index 64% rename from jsonschema_pydantic/types/object_type_parser.py rename to jambo/types/object_type_parser.py index e6b8296..b63de81 100644 --- a/jsonschema_pydantic/types/object_type_parser.py +++ b/jambo/types/object_type_parser.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.types._type_parser import GenericTypeParser +from jambo.types._type_parser import GenericTypeParser class ObjectTypeParser(GenericTypeParser): @@ -8,7 +8,7 @@ class ObjectTypeParser(GenericTypeParser): @staticmethod def from_properties(name, properties): - from jsonschema_pydantic.schema_converter import SchemaConverter + from jambo.schema_converter import SchemaConverter _type = SchemaConverter.build_object(name, properties) return _type, {} diff --git a/jsonschema_pydantic/types/string_type_parser.py b/jambo/types/string_type_parser.py similarity index 72% rename from jsonschema_pydantic/types/string_type_parser.py rename to jambo/types/string_type_parser.py index 4fb3745..d846eed 100644 --- a/jsonschema_pydantic/types/string_type_parser.py +++ b/jambo/types/string_type_parser.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.types._type_parser import GenericTypeParser +from jambo.types._type_parser import GenericTypeParser class StringTypeParser(GenericTypeParser): diff --git a/pyproject.toml b/pyproject.toml index 5f32af1..940ec45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] -name = "jsonschema2pydantic" -version = "0.1.0" +name = "jambo" +dynamic = ["version"] description = "Add your description here" requires-python = ">=3.10,<4.0" @@ -25,9 +25,12 @@ create-hooks = "bash .githooks/set-hooks.sh" # Build System +[tool.hatch.version] +source = "vcs" + [build-system] -requires = ["pdm-backend"] -build-backend = "pdm.backend" +requires = ["hatchling", "hatch-vcs"] +build-backend = "hatchling.build" # Linters diff --git a/tests/test_schema_converter.py b/tests/test_schema_converter.py index 0c7dfd2..d6403f8 100644 --- a/tests/test_schema_converter.py +++ b/tests/test_schema_converter.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.schema_converter import SchemaConverter +from jambo.schema_converter import SchemaConverter from pydantic import BaseModel diff --git a/tests/test_type_parser.py b/tests/test_type_parser.py index e19c0be..b3a1886 100644 --- a/tests/test_type_parser.py +++ b/tests/test_type_parser.py @@ -1,4 +1,4 @@ -from jsonschema_pydantic.types import ( +from jambo.types import ( ArrayTypeParser, FloatTypeParser, GenericTypeParser, diff --git a/uv.lock b/uv.lock index 1f250be..5051f98 100644 --- a/uv.lock +++ b/uv.lock @@ -121,35 +121,7 @@ wheels = [ ] [[package]] -name = "jsonschema" -version = "4.23.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "attrs" }, - { name = "jsonschema-specifications" }, - { name = "referencing" }, - { name = "rpds-py" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/38/2e/03362ee4034a4c917f697890ccd4aec0800ccf9ded7f511971c75451deec/jsonschema-4.23.0.tar.gz", hash = "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4", size = 325778 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/69/4a/4f9dbeb84e8850557c02365a0eee0649abe5eb1d84af92a25731c6c0f922/jsonschema-4.23.0-py3-none-any.whl", hash = "sha256:fbadb6f8b144a8f8cf9f0b89ba94501d143e50411a1278633f56a7acf7fd5566", size = 88462 }, -] - -[[package]] -name = "jsonschema-specifications" -version = "2024.10.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "referencing" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/10/db/58f950c996c793472e336ff3655b13fbcf1e3b359dcf52dcf3ed3b52c352/jsonschema_specifications-2024.10.1.tar.gz", hash = "sha256:0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272", size = 15561 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d1/0f/8910b19ac0670a0f80ce1008e5e751c4a57e14d2c4c13a482aa6079fa9d6/jsonschema_specifications-2024.10.1-py3-none-any.whl", hash = "sha256:a09a0680616357d9a0ecf05c12ad234479f549239d0f5b55f3deea67475da9bf", size = 18459 }, -] - -[[package]] -name = "jsonschema2pydantic" -version = "0.1.0" +name = "jambo" source = { editable = "." } dependencies = [ { name = "jsonschema" }, @@ -178,6 +150,33 @@ dev = [ { name = "pre-commit", specifier = ">=4.2.0" }, ] +[[package]] +name = "jsonschema" +version = "4.23.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "jsonschema-specifications" }, + { name = "referencing" }, + { name = "rpds-py" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/38/2e/03362ee4034a4c917f697890ccd4aec0800ccf9ded7f511971c75451deec/jsonschema-4.23.0.tar.gz", hash = "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4", size = 325778 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/69/4a/4f9dbeb84e8850557c02365a0eee0649abe5eb1d84af92a25731c6c0f922/jsonschema-4.23.0-py3-none-any.whl", hash = "sha256:fbadb6f8b144a8f8cf9f0b89ba94501d143e50411a1278633f56a7acf7fd5566", size = 88462 }, +] + +[[package]] +name = "jsonschema-specifications" +version = "2024.10.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "referencing" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/10/db/58f950c996c793472e336ff3655b13fbcf1e3b359dcf52dcf3ed3b52c352/jsonschema_specifications-2024.10.1.tar.gz", hash = "sha256:0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272", size = 15561 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/0f/8910b19ac0670a0f80ce1008e5e751c4a57e14d2c4c13a482aa6079fa9d6/jsonschema_specifications-2024.10.1-py3-none-any.whl", hash = "sha256:a09a0680616357d9a0ecf05c12ad234479f549239d0f5b55f3deea67475da9bf", size = 18459 }, +] + [[package]] name = "mypy-extensions" version = "1.0.0"