From 73b3b2e6cd018ebeb2a79af224de345e0044a821 Mon Sep 17 00:00:00 2001 From: schapper Date: Wed, 5 Aug 2026 07:18:21 -0700 Subject: [PATCH] Rename theme packages to improve sorting and grouping https://github.com/OvertureMaps/schema/issues/649 Signed-off-by: schapper --- Makefile | 6 +- PYDANTIC_GUIDE.md | 12 +- README.pydantic.md | 14 +- docs/versioning.md | 4 +- packages/overture-schema-codegen/README.md | 2 +- .../changelog.d/649.misc.md | 1 + .../overture-schema-codegen/pyproject.toml | 24 +- .../README.md | 0 .../changelog.d/557.misc.md | 0 .../changelog.d/649.misc.md | 1 + .../changelog.d/README.md | 0 .../pyproject.toml | 2 +- .../src/overture/__init__.py | 0 .../src/overture/schema/__init__.py | 0 .../src/overture/schema/addresses/__init__.py | 0 .../src/overture/schema/addresses/address.py | 0 .../src/overture/schema/addresses/py.typed | 0 .../tests/address_baseline_schema.json | 0 .../test_address_json_schema_baseline.py | 0 .../README.md | 0 .../changelog.d/557.misc.md | 0 .../changelog.d/649.misc.md | 1 + .../changelog.d/README.md | 0 .../pyproject.toml | 2 +- .../src/overture/__init__.py | 0 .../src/overture/schema/__init__.py | 0 .../src/overture/schema/base/__init__.py | 0 .../src/overture/schema/base/_common.py | 0 .../src/overture/schema/base/bathymetry.py | 0 .../overture/schema/base/infrastructure.py | 0 .../src/overture/schema/base/land.py | 0 .../src/overture/schema/base/land_cover.py | 0 .../src/overture/schema/base/land_use.py | 0 .../src/overture/schema/base/py.typed | 0 .../src/overture/schema/base/water.py | 0 .../tests/bathymetry_baseline_schema.json | 0 .../tests/infrastructure_baseline_schema.json | 0 .../tests/land_baseline_schema.json | 0 .../tests/land_cover_baseline_schema.json | 0 .../tests/land_use_baseline_schema.json | 0 .../test_bathymetry_json_schema_baseline.py | 0 ...est_infrastructure_json_schema_baseline.py | 0 .../test_land_cover_json_schema_baseline.py | 0 .../tests/test_land_json_schema_baseline.py | 0 .../test_land_use_json_schema_baseline.py | 0 .../tests/test_water_json_schema_baseline.py | 0 .../tests/water_baseline_schema.json | 0 .../README.md | 0 .../changelog.d/557.misc.md | 0 .../changelog.d/649.misc.md | 1 + .../changelog.d/README.md | 0 .../pyproject.toml | 2 +- .../src/overture/__init__.py | 0 .../src/overture/schema/__init__.py | 0 .../src/overture/schema/buildings/__init__.py | 0 .../src/overture/schema/buildings/_common.py | 0 .../src/overture/schema/buildings/building.py | 0 .../schema/buildings/building_part.py | 0 .../src/overture/schema/buildings/py.typed | 0 .../tests/building_baseline_schema.json | 0 .../tests/building_part_baseline_schema.json | 0 .../test_building_json_schema_baseline.py | 0 ...test_building_part_json_schema_baseline.py | 0 .../README.md | 0 .../changelog.d/557.misc.md | 0 .../changelog.d/649.misc.md | 1 + .../changelog.d/README.md | 0 .../pyproject.toml | 2 +- .../src/overture/__init__.py | 0 .../src/overture/schema/__init__.py | 0 .../src/overture/schema/divisions/__init__.py | 0 .../src/overture/schema/divisions/_common.py | 0 .../src/overture/schema/divisions/division.py | 0 .../schema/divisions/division_area.py | 0 .../schema/divisions/division_boundary.py | 0 .../src/overture/schema/divisions/py.typed | 0 .../tests/division_area_baseline_schema.json | 0 .../tests/division_baseline_schema.json | 0 .../division_boundary_baseline_schema.json | 0 ...test_division_area_json_schema_baseline.py | 0 ..._division_boundary_json_schema_baseline.py | 0 .../test_division_json_schema_baseline.py | 0 .../README.md | 0 .../changelog.d/557.misc.md | 0 .../changelog.d/649.misc.md | 1 + .../changelog.d/README.md | 0 .../pyproject.toml | 2 +- .../src/overture/__init__.py | 0 .../src/overture/schema/__init__.py | 0 .../src/overture/schema/places/__init__.py | 0 .../src/overture/schema/places/place.py | 0 .../src/overture/schema/places/py.typed | 0 .../tests/place_baseline_schema.json | 0 .../tests/test_place_json_schema_baseline.py | 0 .../README.md | 0 .../changelog.d/557.misc.md | 0 .../changelog.d/649.misc.md | 1 + .../changelog.d/README.md | 0 .../pyproject.toml | 2 +- .../src/overture/__init__.py | 0 .../src/overture/schema/__init__.py | 0 .../schema/transportation/__init__.py | 0 .../schema/transportation/connector.py | 0 .../overture/schema/transportation/py.typed | 0 .../schema/transportation/segment/__init__.py | 0 .../schema/transportation/segment/_common.py | 0 .../schema/transportation/segment/rail.py | 0 .../schema/transportation/segment/road.py | 0 .../schema/transportation/segment/water.py | 0 .../tests/connector_baseline_schema.json | 0 .../tests/segment_baseline_schema.json | 0 .../test_connector_json_schema_baseline.py | 0 .../test_segment_json_schema_baseline.py | 0 .../overture-schema/changelog.d/649.misc.md | 1 + packages/overture-schema/pyproject.toml | 24 +- pyproject.toml | 12 +- uv.lock | 226 +++++++++--------- 117 files changed, 177 insertions(+), 167 deletions(-) create mode 100644 packages/overture-schema-codegen/changelog.d/649.misc.md rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/README.md (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/changelog.d/557.misc.md (100%) create mode 100644 packages/overture-schema-theme-addresses/changelog.d/649.misc.md rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/changelog.d/README.md (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/pyproject.toml (97%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/src/overture/__init__.py (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/src/overture/schema/__init__.py (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/src/overture/schema/addresses/__init__.py (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/src/overture/schema/addresses/address.py (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/src/overture/schema/addresses/py.typed (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/tests/address_baseline_schema.json (100%) rename packages/{overture-schema-addresses-theme => overture-schema-theme-addresses}/tests/test_address_json_schema_baseline.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/README.md (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/changelog.d/557.misc.md (100%) create mode 100644 packages/overture-schema-theme-base/changelog.d/649.misc.md rename packages/{overture-schema-base-theme => overture-schema-theme-base}/changelog.d/README.md (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/pyproject.toml (99%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/__init__.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/__init__.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/__init__.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/_common.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/bathymetry.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/infrastructure.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/land.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/land_cover.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/land_use.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/py.typed (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/src/overture/schema/base/water.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/bathymetry_baseline_schema.json (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/infrastructure_baseline_schema.json (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/land_baseline_schema.json (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/land_cover_baseline_schema.json (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/land_use_baseline_schema.json (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/test_bathymetry_json_schema_baseline.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/test_infrastructure_json_schema_baseline.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/test_land_cover_json_schema_baseline.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/test_land_json_schema_baseline.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/test_land_use_json_schema_baseline.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/test_water_json_schema_baseline.py (100%) rename packages/{overture-schema-base-theme => overture-schema-theme-base}/tests/water_baseline_schema.json (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/README.md (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/changelog.d/557.misc.md (100%) create mode 100644 packages/overture-schema-theme-buildings/changelog.d/649.misc.md rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/changelog.d/README.md (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/pyproject.toml (98%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/src/overture/__init__.py (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/src/overture/schema/__init__.py (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/src/overture/schema/buildings/__init__.py (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/src/overture/schema/buildings/_common.py (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/src/overture/schema/buildings/building.py (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/src/overture/schema/buildings/building_part.py (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/src/overture/schema/buildings/py.typed (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/tests/building_baseline_schema.json (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/tests/building_part_baseline_schema.json (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/tests/test_building_json_schema_baseline.py (100%) rename packages/{overture-schema-buildings-theme => overture-schema-theme-buildings}/tests/test_building_part_json_schema_baseline.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/README.md (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/changelog.d/557.misc.md (100%) create mode 100644 packages/overture-schema-theme-divisions/changelog.d/649.misc.md rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/changelog.d/README.md (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/pyproject.toml (99%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/__init__.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/schema/__init__.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/schema/divisions/__init__.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/schema/divisions/_common.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/schema/divisions/division.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/schema/divisions/division_area.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/schema/divisions/division_boundary.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/src/overture/schema/divisions/py.typed (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/tests/division_area_baseline_schema.json (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/tests/division_baseline_schema.json (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/tests/division_boundary_baseline_schema.json (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/tests/test_division_area_json_schema_baseline.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/tests/test_division_boundary_json_schema_baseline.py (100%) rename packages/{overture-schema-divisions-theme => overture-schema-theme-divisions}/tests/test_division_json_schema_baseline.py (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/README.md (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/changelog.d/557.misc.md (100%) create mode 100644 packages/overture-schema-theme-places/changelog.d/649.misc.md rename packages/{overture-schema-places-theme => overture-schema-theme-places}/changelog.d/README.md (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/pyproject.toml (98%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/src/overture/__init__.py (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/src/overture/schema/__init__.py (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/src/overture/schema/places/__init__.py (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/src/overture/schema/places/place.py (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/src/overture/schema/places/py.typed (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/tests/place_baseline_schema.json (100%) rename packages/{overture-schema-places-theme => overture-schema-theme-places}/tests/test_place_json_schema_baseline.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/README.md (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/changelog.d/557.misc.md (100%) create mode 100644 packages/overture-schema-theme-transportation/changelog.d/649.misc.md rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/changelog.d/README.md (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/pyproject.toml (99%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/__init__.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/__init__.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/__init__.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/connector.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/py.typed (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/segment/__init__.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/segment/_common.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/segment/rail.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/segment/road.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/src/overture/schema/transportation/segment/water.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/tests/connector_baseline_schema.json (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/tests/segment_baseline_schema.json (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/tests/test_connector_json_schema_baseline.py (100%) rename packages/{overture-schema-transportation-theme => overture-schema-theme-transportation}/tests/test_segment_json_schema_baseline.py (100%) create mode 100644 packages/overture-schema/changelog.d/649.misc.md diff --git a/Makefile b/Makefile index 33ce34306..be9757562 100644 --- a/Makefile +++ b/Makefile @@ -65,10 +65,12 @@ doctest-only: mypy: uv-sync mypy-only mypy-only: - @# $$ escapes $ for make - sed needs literal $ for end-of-line anchor + @# $$ escapes $ for make - sed replaces the -theme- infix (packages were + @# renamed overture-schema--theme -> overture-schema-theme-) so the + @# derived mypy module stays overture.schema. @find packages -maxdepth 1 -type d -name "overture-schema*" \ | sort \ - | sed 's|-theme$$||' \ + | sed 's|-theme-|-|' \ | tr - . \ | sed 's|^packages/|-p |' \ | xargs uv run mypy --no-error-summary diff --git a/PYDANTIC_GUIDE.md b/PYDANTIC_GUIDE.md index 57e7d3979..4571b2afe 100644 --- a/PYDANTIC_GUIDE.md +++ b/PYDANTIC_GUIDE.md @@ -848,13 +848,13 @@ road_segment = RoadSegment(subtype=Subtype.ROAD, ...) # Valid Instead of making classes abstract, we use **entry point registration** where only specific concrete types are discoverable as map features: ```python -# In packages/overture-schema-transportation-theme/pyproject.toml +# In packages/overture-schema-theme-transportation/pyproject.toml [project.entry-points."overture.models"] connector = "overture.schema.transportation:Connector" segment = "overture.schema.transportation:Segment" ``` -**Real example:** See [`packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/__init__.py`](packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/__init__.py) where: +**Real example:** See [`packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/__init__.py`](packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/__init__.py) where: - **`Segment`** is a discriminated union: `RoadSegment | RailSegment | WaterSegment` - **`TransportationSegment`** is the concrete base class that all segment types inherit from @@ -1003,11 +1003,11 @@ Organize code by scope and avoid circular imports: - Used by multiple themes (e.g., `OvertureFeature`, `Names`, `Sources`, `Scope`) -**Theme-level shared**: Theme package root (e.g., `overture-schema-transportation-theme/src/overture/schema/transportation/`) +**Theme-level shared**: Theme package root (e.g., `overture-schema-theme-transportation/src/overture/schema/transportation/`) - Used by multiple types within a theme (e.g., `AccessRules`, `RoadSurface`) -**Type-specific**: Type subdirectory (e.g., `overture-schema-transportation-theme/src/overture/schema/transportation/segment/`) +**Type-specific**: Type subdirectory (e.g., `overture-schema-theme-transportation/src/overture/schema/transportation/segment/`) - Only used by one specific type (e.g., `SegmentType`, `LaneConfiguration`) @@ -1088,14 +1088,14 @@ properties: **Pydantic approach:** ```python -# In overture-schema-addresses-theme/src/overture/schema/addresses/address.py +# In overture-schema-theme-addresses/src/overture/schema/addresses/address.py @no_extra_fields class Address(BaseModel): """A postal address.""" freeform: str | None = None locality: str | None = None -# In overture-schema-buildings-theme/src/overture/schema/buildings/building.py +# In overture-schema-theme-buildings/src/overture/schema/buildings/building.py class Building(OvertureFeature): address: Address | None = None ``` diff --git a/README.pydantic.md b/README.pydantic.md index e03afba56..866e39670 100644 --- a/README.pydantic.md +++ b/README.pydantic.md @@ -96,16 +96,16 @@ This workspace contains the following packages: ### Theme Packages -- **`overture-schema-addresses-theme`** - Address features -- **`overture-schema-base-theme`** - Foundational geographic features (land, water, +- **`overture-schema-theme-addresses`** - Address features +- **`overture-schema-theme-base`** - Foundational geographic features (land, water, infrastructure, bathymetry, land cover, land use) -- **`overture-schema-buildings-theme`** - Building footprints and building parts with +- **`overture-schema-theme-buildings`** - Building footprints and building parts with architectural details -- **`overture-schema-divisions-theme`** - Administrative boundaries, division areas, and +- **`overture-schema-theme-divisions`** - Administrative boundaries, division areas, and political boundaries -- **`overture-schema-places-theme`** - Points of interest, businesses, and named +- **`overture-schema-theme-places`** - Points of interest, businesses, and named locations -- **`overture-schema-transportation-theme`** - Road segments and transportation network +- **`overture-schema-theme-transportation`** - Road segments and transportation network connectors ### Usage (Python) @@ -218,7 +218,7 @@ uv sync --all-packages make check # Run tests for a specific package -uv run pytest packages/overture-schema-buildings-theme/ +uv run pytest packages/overture-schema-theme-buildings/ # Run tests matching a pattern uv run pytest -k "buildings" diff --git a/docs/versioning.md b/docs/versioning.md index 88a31f995..31ae9971c 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -99,10 +99,10 @@ example: ```bash # 1. One small markdown file, named ..md echo 'Fixed brand enum values rejecting valid entries.' \ - > packages/overture-schema-places-theme/changelog.d/561.bugfix.md + > packages/overture-schema-theme-places/changelog.d/561.bugfix.md # 2. Commit it with your change -git add packages/overture-schema-places-theme/changelog.d/561.bugfix.md +git add packages/overture-schema-theme-places/changelog.d/561.bugfix.md git commit -m 'Add changelog fragment' ``` diff --git a/packages/overture-schema-codegen/README.md b/packages/overture-schema-codegen/README.md index 67c35002e..3252dfffd 100644 --- a/packages/overture-schema-codegen/README.md +++ b/packages/overture-schema-codegen/README.md @@ -29,7 +29,7 @@ overture-codegen list ``` The generator discovers models via `overture.models` entry points (provided by theme -packages like `overture-schema-buildings-theme`), extracts type information, and renders +packages like `overture-schema-theme-buildings`), extracts type information, and renders output pages with cross-page links, constraint descriptions, and validated examples. ## Architecture diff --git a/packages/overture-schema-codegen/changelog.d/649.misc.md b/packages/overture-schema-codegen/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema-codegen/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema-codegen/pyproject.toml b/packages/overture-schema-codegen/pyproject.toml index dc3c09445..5f0655c51 100644 --- a/packages/overture-schema-codegen/pyproject.toml +++ b/packages/overture-schema-codegen/pyproject.toml @@ -22,24 +22,24 @@ requires-python = ">=3.10" overture-codegen = "overture.schema.codegen.cli:main" [tool.uv.sources] -overture-schema-addresses-theme = { workspace = true } -overture-schema-base-theme = { workspace = true } -overture-schema-buildings-theme = { workspace = true } overture-schema-cli = { workspace = true } overture-schema-common = { workspace = true } -overture-schema-divisions-theme = { workspace = true } -overture-schema-places-theme = { workspace = true } overture-schema-system = { workspace = true } -overture-schema-transportation-theme = { workspace = true } +overture-schema-theme-addresses = { workspace = true } +overture-schema-theme-base = { workspace = true } +overture-schema-theme-buildings = { workspace = true } +overture-schema-theme-divisions = { workspace = true } +overture-schema-theme-places = { workspace = true } +overture-schema-theme-transportation = { workspace = true } [dependency-groups] test = [ - "overture-schema-addresses-theme", - "overture-schema-base-theme", - "overture-schema-buildings-theme", - "overture-schema-divisions-theme", - "overture-schema-places-theme", - "overture-schema-transportation-theme", + "overture-schema-theme-addresses", + "overture-schema-theme-base", + "overture-schema-theme-buildings", + "overture-schema-theme-divisions", + "overture-schema-theme-places", + "overture-schema-theme-transportation", ] [tool.hatch.build.targets.wheel] diff --git a/packages/overture-schema-addresses-theme/README.md b/packages/overture-schema-theme-addresses/README.md similarity index 100% rename from packages/overture-schema-addresses-theme/README.md rename to packages/overture-schema-theme-addresses/README.md diff --git a/packages/overture-schema-addresses-theme/changelog.d/557.misc.md b/packages/overture-schema-theme-addresses/changelog.d/557.misc.md similarity index 100% rename from packages/overture-schema-addresses-theme/changelog.d/557.misc.md rename to packages/overture-schema-theme-addresses/changelog.d/557.misc.md diff --git a/packages/overture-schema-theme-addresses/changelog.d/649.misc.md b/packages/overture-schema-theme-addresses/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema-theme-addresses/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema-addresses-theme/changelog.d/README.md b/packages/overture-schema-theme-addresses/changelog.d/README.md similarity index 100% rename from packages/overture-schema-addresses-theme/changelog.d/README.md rename to packages/overture-schema-theme-addresses/changelog.d/README.md diff --git a/packages/overture-schema-addresses-theme/pyproject.toml b/packages/overture-schema-theme-addresses/pyproject.toml similarity index 97% rename from packages/overture-schema-addresses-theme/pyproject.toml rename to packages/overture-schema-theme-addresses/pyproject.toml index 7cb105b5e..eafc41757 100644 --- a/packages/overture-schema-addresses-theme/pyproject.toml +++ b/packages/overture-schema-theme-addresses/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ description = "Overture Maps addresses theme models and structures" version = "0.1.1" license = "MIT" -name = "overture-schema-addresses-theme" +name = "overture-schema-theme-addresses" readme = "README.md" requires-python = ">=3.10" diff --git a/packages/overture-schema-addresses-theme/src/overture/__init__.py b/packages/overture-schema-theme-addresses/src/overture/__init__.py similarity index 100% rename from packages/overture-schema-addresses-theme/src/overture/__init__.py rename to packages/overture-schema-theme-addresses/src/overture/__init__.py diff --git a/packages/overture-schema-addresses-theme/src/overture/schema/__init__.py b/packages/overture-schema-theme-addresses/src/overture/schema/__init__.py similarity index 100% rename from packages/overture-schema-addresses-theme/src/overture/schema/__init__.py rename to packages/overture-schema-theme-addresses/src/overture/schema/__init__.py diff --git a/packages/overture-schema-addresses-theme/src/overture/schema/addresses/__init__.py b/packages/overture-schema-theme-addresses/src/overture/schema/addresses/__init__.py similarity index 100% rename from packages/overture-schema-addresses-theme/src/overture/schema/addresses/__init__.py rename to packages/overture-schema-theme-addresses/src/overture/schema/addresses/__init__.py diff --git a/packages/overture-schema-addresses-theme/src/overture/schema/addresses/address.py b/packages/overture-schema-theme-addresses/src/overture/schema/addresses/address.py similarity index 100% rename from packages/overture-schema-addresses-theme/src/overture/schema/addresses/address.py rename to packages/overture-schema-theme-addresses/src/overture/schema/addresses/address.py diff --git a/packages/overture-schema-addresses-theme/src/overture/schema/addresses/py.typed b/packages/overture-schema-theme-addresses/src/overture/schema/addresses/py.typed similarity index 100% rename from packages/overture-schema-addresses-theme/src/overture/schema/addresses/py.typed rename to packages/overture-schema-theme-addresses/src/overture/schema/addresses/py.typed diff --git a/packages/overture-schema-addresses-theme/tests/address_baseline_schema.json b/packages/overture-schema-theme-addresses/tests/address_baseline_schema.json similarity index 100% rename from packages/overture-schema-addresses-theme/tests/address_baseline_schema.json rename to packages/overture-schema-theme-addresses/tests/address_baseline_schema.json diff --git a/packages/overture-schema-addresses-theme/tests/test_address_json_schema_baseline.py b/packages/overture-schema-theme-addresses/tests/test_address_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-addresses-theme/tests/test_address_json_schema_baseline.py rename to packages/overture-schema-theme-addresses/tests/test_address_json_schema_baseline.py diff --git a/packages/overture-schema-base-theme/README.md b/packages/overture-schema-theme-base/README.md similarity index 100% rename from packages/overture-schema-base-theme/README.md rename to packages/overture-schema-theme-base/README.md diff --git a/packages/overture-schema-base-theme/changelog.d/557.misc.md b/packages/overture-schema-theme-base/changelog.d/557.misc.md similarity index 100% rename from packages/overture-schema-base-theme/changelog.d/557.misc.md rename to packages/overture-schema-theme-base/changelog.d/557.misc.md diff --git a/packages/overture-schema-theme-base/changelog.d/649.misc.md b/packages/overture-schema-theme-base/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema-theme-base/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema-base-theme/changelog.d/README.md b/packages/overture-schema-theme-base/changelog.d/README.md similarity index 100% rename from packages/overture-schema-base-theme/changelog.d/README.md rename to packages/overture-schema-theme-base/changelog.d/README.md diff --git a/packages/overture-schema-base-theme/pyproject.toml b/packages/overture-schema-theme-base/pyproject.toml similarity index 99% rename from packages/overture-schema-base-theme/pyproject.toml rename to packages/overture-schema-theme-base/pyproject.toml index 38662bafa..e5791fbf8 100644 --- a/packages/overture-schema-base-theme/pyproject.toml +++ b/packages/overture-schema-theme-base/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ description = "Overture Maps base theme shared structures and models (bathymetry, infrastructure, land, land_cover, land_use, water)" version = "0.1.1" license = "MIT" -name = "overture-schema-base-theme" +name = "overture-schema-theme-base" readme = "README.md" requires-python = ">=3.10" diff --git a/packages/overture-schema-base-theme/src/overture/__init__.py b/packages/overture-schema-theme-base/src/overture/__init__.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/__init__.py rename to packages/overture-schema-theme-base/src/overture/__init__.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/__init__.py b/packages/overture-schema-theme-base/src/overture/schema/__init__.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/__init__.py rename to packages/overture-schema-theme-base/src/overture/schema/__init__.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/__init__.py b/packages/overture-schema-theme-base/src/overture/schema/base/__init__.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/__init__.py rename to packages/overture-schema-theme-base/src/overture/schema/base/__init__.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/_common.py b/packages/overture-schema-theme-base/src/overture/schema/base/_common.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/_common.py rename to packages/overture-schema-theme-base/src/overture/schema/base/_common.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/bathymetry.py b/packages/overture-schema-theme-base/src/overture/schema/base/bathymetry.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/bathymetry.py rename to packages/overture-schema-theme-base/src/overture/schema/base/bathymetry.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/infrastructure.py b/packages/overture-schema-theme-base/src/overture/schema/base/infrastructure.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/infrastructure.py rename to packages/overture-schema-theme-base/src/overture/schema/base/infrastructure.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/land.py b/packages/overture-schema-theme-base/src/overture/schema/base/land.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/land.py rename to packages/overture-schema-theme-base/src/overture/schema/base/land.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/land_cover.py b/packages/overture-schema-theme-base/src/overture/schema/base/land_cover.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/land_cover.py rename to packages/overture-schema-theme-base/src/overture/schema/base/land_cover.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/land_use.py b/packages/overture-schema-theme-base/src/overture/schema/base/land_use.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/land_use.py rename to packages/overture-schema-theme-base/src/overture/schema/base/land_use.py diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/py.typed b/packages/overture-schema-theme-base/src/overture/schema/base/py.typed similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/py.typed rename to packages/overture-schema-theme-base/src/overture/schema/base/py.typed diff --git a/packages/overture-schema-base-theme/src/overture/schema/base/water.py b/packages/overture-schema-theme-base/src/overture/schema/base/water.py similarity index 100% rename from packages/overture-schema-base-theme/src/overture/schema/base/water.py rename to packages/overture-schema-theme-base/src/overture/schema/base/water.py diff --git a/packages/overture-schema-base-theme/tests/bathymetry_baseline_schema.json b/packages/overture-schema-theme-base/tests/bathymetry_baseline_schema.json similarity index 100% rename from packages/overture-schema-base-theme/tests/bathymetry_baseline_schema.json rename to packages/overture-schema-theme-base/tests/bathymetry_baseline_schema.json diff --git a/packages/overture-schema-base-theme/tests/infrastructure_baseline_schema.json b/packages/overture-schema-theme-base/tests/infrastructure_baseline_schema.json similarity index 100% rename from packages/overture-schema-base-theme/tests/infrastructure_baseline_schema.json rename to packages/overture-schema-theme-base/tests/infrastructure_baseline_schema.json diff --git a/packages/overture-schema-base-theme/tests/land_baseline_schema.json b/packages/overture-schema-theme-base/tests/land_baseline_schema.json similarity index 100% rename from packages/overture-schema-base-theme/tests/land_baseline_schema.json rename to packages/overture-schema-theme-base/tests/land_baseline_schema.json diff --git a/packages/overture-schema-base-theme/tests/land_cover_baseline_schema.json b/packages/overture-schema-theme-base/tests/land_cover_baseline_schema.json similarity index 100% rename from packages/overture-schema-base-theme/tests/land_cover_baseline_schema.json rename to packages/overture-schema-theme-base/tests/land_cover_baseline_schema.json diff --git a/packages/overture-schema-base-theme/tests/land_use_baseline_schema.json b/packages/overture-schema-theme-base/tests/land_use_baseline_schema.json similarity index 100% rename from packages/overture-schema-base-theme/tests/land_use_baseline_schema.json rename to packages/overture-schema-theme-base/tests/land_use_baseline_schema.json diff --git a/packages/overture-schema-base-theme/tests/test_bathymetry_json_schema_baseline.py b/packages/overture-schema-theme-base/tests/test_bathymetry_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-base-theme/tests/test_bathymetry_json_schema_baseline.py rename to packages/overture-schema-theme-base/tests/test_bathymetry_json_schema_baseline.py diff --git a/packages/overture-schema-base-theme/tests/test_infrastructure_json_schema_baseline.py b/packages/overture-schema-theme-base/tests/test_infrastructure_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-base-theme/tests/test_infrastructure_json_schema_baseline.py rename to packages/overture-schema-theme-base/tests/test_infrastructure_json_schema_baseline.py diff --git a/packages/overture-schema-base-theme/tests/test_land_cover_json_schema_baseline.py b/packages/overture-schema-theme-base/tests/test_land_cover_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-base-theme/tests/test_land_cover_json_schema_baseline.py rename to packages/overture-schema-theme-base/tests/test_land_cover_json_schema_baseline.py diff --git a/packages/overture-schema-base-theme/tests/test_land_json_schema_baseline.py b/packages/overture-schema-theme-base/tests/test_land_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-base-theme/tests/test_land_json_schema_baseline.py rename to packages/overture-schema-theme-base/tests/test_land_json_schema_baseline.py diff --git a/packages/overture-schema-base-theme/tests/test_land_use_json_schema_baseline.py b/packages/overture-schema-theme-base/tests/test_land_use_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-base-theme/tests/test_land_use_json_schema_baseline.py rename to packages/overture-schema-theme-base/tests/test_land_use_json_schema_baseline.py diff --git a/packages/overture-schema-base-theme/tests/test_water_json_schema_baseline.py b/packages/overture-schema-theme-base/tests/test_water_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-base-theme/tests/test_water_json_schema_baseline.py rename to packages/overture-schema-theme-base/tests/test_water_json_schema_baseline.py diff --git a/packages/overture-schema-base-theme/tests/water_baseline_schema.json b/packages/overture-schema-theme-base/tests/water_baseline_schema.json similarity index 100% rename from packages/overture-schema-base-theme/tests/water_baseline_schema.json rename to packages/overture-schema-theme-base/tests/water_baseline_schema.json diff --git a/packages/overture-schema-buildings-theme/README.md b/packages/overture-schema-theme-buildings/README.md similarity index 100% rename from packages/overture-schema-buildings-theme/README.md rename to packages/overture-schema-theme-buildings/README.md diff --git a/packages/overture-schema-buildings-theme/changelog.d/557.misc.md b/packages/overture-schema-theme-buildings/changelog.d/557.misc.md similarity index 100% rename from packages/overture-schema-buildings-theme/changelog.d/557.misc.md rename to packages/overture-schema-theme-buildings/changelog.d/557.misc.md diff --git a/packages/overture-schema-theme-buildings/changelog.d/649.misc.md b/packages/overture-schema-theme-buildings/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema-theme-buildings/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema-buildings-theme/changelog.d/README.md b/packages/overture-schema-theme-buildings/changelog.d/README.md similarity index 100% rename from packages/overture-schema-buildings-theme/changelog.d/README.md rename to packages/overture-schema-theme-buildings/changelog.d/README.md diff --git a/packages/overture-schema-buildings-theme/pyproject.toml b/packages/overture-schema-theme-buildings/pyproject.toml similarity index 98% rename from packages/overture-schema-buildings-theme/pyproject.toml rename to packages/overture-schema-theme-buildings/pyproject.toml index 0cbb9f172..f735f2d18 100644 --- a/packages/overture-schema-buildings-theme/pyproject.toml +++ b/packages/overture-schema-theme-buildings/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ description = "Overture Maps buildings theme shared structures, building types, and building part types" version = "0.1.1" license = "MIT" -name = "overture-schema-buildings-theme" +name = "overture-schema-theme-buildings" readme = "README.md" requires-python = ">=3.10" diff --git a/packages/overture-schema-buildings-theme/src/overture/__init__.py b/packages/overture-schema-theme-buildings/src/overture/__init__.py similarity index 100% rename from packages/overture-schema-buildings-theme/src/overture/__init__.py rename to packages/overture-schema-theme-buildings/src/overture/__init__.py diff --git a/packages/overture-schema-buildings-theme/src/overture/schema/__init__.py b/packages/overture-schema-theme-buildings/src/overture/schema/__init__.py similarity index 100% rename from packages/overture-schema-buildings-theme/src/overture/schema/__init__.py rename to packages/overture-schema-theme-buildings/src/overture/schema/__init__.py diff --git a/packages/overture-schema-buildings-theme/src/overture/schema/buildings/__init__.py b/packages/overture-schema-theme-buildings/src/overture/schema/buildings/__init__.py similarity index 100% rename from packages/overture-schema-buildings-theme/src/overture/schema/buildings/__init__.py rename to packages/overture-schema-theme-buildings/src/overture/schema/buildings/__init__.py diff --git a/packages/overture-schema-buildings-theme/src/overture/schema/buildings/_common.py b/packages/overture-schema-theme-buildings/src/overture/schema/buildings/_common.py similarity index 100% rename from packages/overture-schema-buildings-theme/src/overture/schema/buildings/_common.py rename to packages/overture-schema-theme-buildings/src/overture/schema/buildings/_common.py diff --git a/packages/overture-schema-buildings-theme/src/overture/schema/buildings/building.py b/packages/overture-schema-theme-buildings/src/overture/schema/buildings/building.py similarity index 100% rename from packages/overture-schema-buildings-theme/src/overture/schema/buildings/building.py rename to packages/overture-schema-theme-buildings/src/overture/schema/buildings/building.py diff --git a/packages/overture-schema-buildings-theme/src/overture/schema/buildings/building_part.py b/packages/overture-schema-theme-buildings/src/overture/schema/buildings/building_part.py similarity index 100% rename from packages/overture-schema-buildings-theme/src/overture/schema/buildings/building_part.py rename to packages/overture-schema-theme-buildings/src/overture/schema/buildings/building_part.py diff --git a/packages/overture-schema-buildings-theme/src/overture/schema/buildings/py.typed b/packages/overture-schema-theme-buildings/src/overture/schema/buildings/py.typed similarity index 100% rename from packages/overture-schema-buildings-theme/src/overture/schema/buildings/py.typed rename to packages/overture-schema-theme-buildings/src/overture/schema/buildings/py.typed diff --git a/packages/overture-schema-buildings-theme/tests/building_baseline_schema.json b/packages/overture-schema-theme-buildings/tests/building_baseline_schema.json similarity index 100% rename from packages/overture-schema-buildings-theme/tests/building_baseline_schema.json rename to packages/overture-schema-theme-buildings/tests/building_baseline_schema.json diff --git a/packages/overture-schema-buildings-theme/tests/building_part_baseline_schema.json b/packages/overture-schema-theme-buildings/tests/building_part_baseline_schema.json similarity index 100% rename from packages/overture-schema-buildings-theme/tests/building_part_baseline_schema.json rename to packages/overture-schema-theme-buildings/tests/building_part_baseline_schema.json diff --git a/packages/overture-schema-buildings-theme/tests/test_building_json_schema_baseline.py b/packages/overture-schema-theme-buildings/tests/test_building_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-buildings-theme/tests/test_building_json_schema_baseline.py rename to packages/overture-schema-theme-buildings/tests/test_building_json_schema_baseline.py diff --git a/packages/overture-schema-buildings-theme/tests/test_building_part_json_schema_baseline.py b/packages/overture-schema-theme-buildings/tests/test_building_part_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-buildings-theme/tests/test_building_part_json_schema_baseline.py rename to packages/overture-schema-theme-buildings/tests/test_building_part_json_schema_baseline.py diff --git a/packages/overture-schema-divisions-theme/README.md b/packages/overture-schema-theme-divisions/README.md similarity index 100% rename from packages/overture-schema-divisions-theme/README.md rename to packages/overture-schema-theme-divisions/README.md diff --git a/packages/overture-schema-divisions-theme/changelog.d/557.misc.md b/packages/overture-schema-theme-divisions/changelog.d/557.misc.md similarity index 100% rename from packages/overture-schema-divisions-theme/changelog.d/557.misc.md rename to packages/overture-schema-theme-divisions/changelog.d/557.misc.md diff --git a/packages/overture-schema-theme-divisions/changelog.d/649.misc.md b/packages/overture-schema-theme-divisions/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema-theme-divisions/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema-divisions-theme/changelog.d/README.md b/packages/overture-schema-theme-divisions/changelog.d/README.md similarity index 100% rename from packages/overture-schema-divisions-theme/changelog.d/README.md rename to packages/overture-schema-theme-divisions/changelog.d/README.md diff --git a/packages/overture-schema-divisions-theme/pyproject.toml b/packages/overture-schema-theme-divisions/pyproject.toml similarity index 99% rename from packages/overture-schema-divisions-theme/pyproject.toml rename to packages/overture-schema-theme-divisions/pyproject.toml index e1ac36d2e..ed5d62eb8 100644 --- a/packages/overture-schema-divisions-theme/pyproject.toml +++ b/packages/overture-schema-theme-divisions/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ description = "Overture Maps divisions theme shared structures, division, division area and division boundary types" version = "0.1.1" license = "MIT" -name = "overture-schema-divisions-theme" +name = "overture-schema-theme-divisions" readme = "README.md" requires-python = ">=3.10" diff --git a/packages/overture-schema-divisions-theme/src/overture/__init__.py b/packages/overture-schema-theme-divisions/src/overture/__init__.py similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/__init__.py rename to packages/overture-schema-theme-divisions/src/overture/__init__.py diff --git a/packages/overture-schema-divisions-theme/src/overture/schema/__init__.py b/packages/overture-schema-theme-divisions/src/overture/schema/__init__.py similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/schema/__init__.py rename to packages/overture-schema-theme-divisions/src/overture/schema/__init__.py diff --git a/packages/overture-schema-divisions-theme/src/overture/schema/divisions/__init__.py b/packages/overture-schema-theme-divisions/src/overture/schema/divisions/__init__.py similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/schema/divisions/__init__.py rename to packages/overture-schema-theme-divisions/src/overture/schema/divisions/__init__.py diff --git a/packages/overture-schema-divisions-theme/src/overture/schema/divisions/_common.py b/packages/overture-schema-theme-divisions/src/overture/schema/divisions/_common.py similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/schema/divisions/_common.py rename to packages/overture-schema-theme-divisions/src/overture/schema/divisions/_common.py diff --git a/packages/overture-schema-divisions-theme/src/overture/schema/divisions/division.py b/packages/overture-schema-theme-divisions/src/overture/schema/divisions/division.py similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/schema/divisions/division.py rename to packages/overture-schema-theme-divisions/src/overture/schema/divisions/division.py diff --git a/packages/overture-schema-divisions-theme/src/overture/schema/divisions/division_area.py b/packages/overture-schema-theme-divisions/src/overture/schema/divisions/division_area.py similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/schema/divisions/division_area.py rename to packages/overture-schema-theme-divisions/src/overture/schema/divisions/division_area.py diff --git a/packages/overture-schema-divisions-theme/src/overture/schema/divisions/division_boundary.py b/packages/overture-schema-theme-divisions/src/overture/schema/divisions/division_boundary.py similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/schema/divisions/division_boundary.py rename to packages/overture-schema-theme-divisions/src/overture/schema/divisions/division_boundary.py diff --git a/packages/overture-schema-divisions-theme/src/overture/schema/divisions/py.typed b/packages/overture-schema-theme-divisions/src/overture/schema/divisions/py.typed similarity index 100% rename from packages/overture-schema-divisions-theme/src/overture/schema/divisions/py.typed rename to packages/overture-schema-theme-divisions/src/overture/schema/divisions/py.typed diff --git a/packages/overture-schema-divisions-theme/tests/division_area_baseline_schema.json b/packages/overture-schema-theme-divisions/tests/division_area_baseline_schema.json similarity index 100% rename from packages/overture-schema-divisions-theme/tests/division_area_baseline_schema.json rename to packages/overture-schema-theme-divisions/tests/division_area_baseline_schema.json diff --git a/packages/overture-schema-divisions-theme/tests/division_baseline_schema.json b/packages/overture-schema-theme-divisions/tests/division_baseline_schema.json similarity index 100% rename from packages/overture-schema-divisions-theme/tests/division_baseline_schema.json rename to packages/overture-schema-theme-divisions/tests/division_baseline_schema.json diff --git a/packages/overture-schema-divisions-theme/tests/division_boundary_baseline_schema.json b/packages/overture-schema-theme-divisions/tests/division_boundary_baseline_schema.json similarity index 100% rename from packages/overture-schema-divisions-theme/tests/division_boundary_baseline_schema.json rename to packages/overture-schema-theme-divisions/tests/division_boundary_baseline_schema.json diff --git a/packages/overture-schema-divisions-theme/tests/test_division_area_json_schema_baseline.py b/packages/overture-schema-theme-divisions/tests/test_division_area_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-divisions-theme/tests/test_division_area_json_schema_baseline.py rename to packages/overture-schema-theme-divisions/tests/test_division_area_json_schema_baseline.py diff --git a/packages/overture-schema-divisions-theme/tests/test_division_boundary_json_schema_baseline.py b/packages/overture-schema-theme-divisions/tests/test_division_boundary_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-divisions-theme/tests/test_division_boundary_json_schema_baseline.py rename to packages/overture-schema-theme-divisions/tests/test_division_boundary_json_schema_baseline.py diff --git a/packages/overture-schema-divisions-theme/tests/test_division_json_schema_baseline.py b/packages/overture-schema-theme-divisions/tests/test_division_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-divisions-theme/tests/test_division_json_schema_baseline.py rename to packages/overture-schema-theme-divisions/tests/test_division_json_schema_baseline.py diff --git a/packages/overture-schema-places-theme/README.md b/packages/overture-schema-theme-places/README.md similarity index 100% rename from packages/overture-schema-places-theme/README.md rename to packages/overture-schema-theme-places/README.md diff --git a/packages/overture-schema-places-theme/changelog.d/557.misc.md b/packages/overture-schema-theme-places/changelog.d/557.misc.md similarity index 100% rename from packages/overture-schema-places-theme/changelog.d/557.misc.md rename to packages/overture-schema-theme-places/changelog.d/557.misc.md diff --git a/packages/overture-schema-theme-places/changelog.d/649.misc.md b/packages/overture-schema-theme-places/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema-theme-places/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema-places-theme/changelog.d/README.md b/packages/overture-schema-theme-places/changelog.d/README.md similarity index 100% rename from packages/overture-schema-places-theme/changelog.d/README.md rename to packages/overture-schema-theme-places/changelog.d/README.md diff --git a/packages/overture-schema-places-theme/pyproject.toml b/packages/overture-schema-theme-places/pyproject.toml similarity index 98% rename from packages/overture-schema-places-theme/pyproject.toml rename to packages/overture-schema-theme-places/pyproject.toml index 811a3d92a..e722386e7 100644 --- a/packages/overture-schema-places-theme/pyproject.toml +++ b/packages/overture-schema-theme-places/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ description = "Overture Maps places theme with place type models" version = "0.1.1" license = "MIT" -name = "overture-schema-places-theme" +name = "overture-schema-theme-places" readme = "README.md" requires-python = ">=3.10" diff --git a/packages/overture-schema-places-theme/src/overture/__init__.py b/packages/overture-schema-theme-places/src/overture/__init__.py similarity index 100% rename from packages/overture-schema-places-theme/src/overture/__init__.py rename to packages/overture-schema-theme-places/src/overture/__init__.py diff --git a/packages/overture-schema-places-theme/src/overture/schema/__init__.py b/packages/overture-schema-theme-places/src/overture/schema/__init__.py similarity index 100% rename from packages/overture-schema-places-theme/src/overture/schema/__init__.py rename to packages/overture-schema-theme-places/src/overture/schema/__init__.py diff --git a/packages/overture-schema-places-theme/src/overture/schema/places/__init__.py b/packages/overture-schema-theme-places/src/overture/schema/places/__init__.py similarity index 100% rename from packages/overture-schema-places-theme/src/overture/schema/places/__init__.py rename to packages/overture-schema-theme-places/src/overture/schema/places/__init__.py diff --git a/packages/overture-schema-places-theme/src/overture/schema/places/place.py b/packages/overture-schema-theme-places/src/overture/schema/places/place.py similarity index 100% rename from packages/overture-schema-places-theme/src/overture/schema/places/place.py rename to packages/overture-schema-theme-places/src/overture/schema/places/place.py diff --git a/packages/overture-schema-places-theme/src/overture/schema/places/py.typed b/packages/overture-schema-theme-places/src/overture/schema/places/py.typed similarity index 100% rename from packages/overture-schema-places-theme/src/overture/schema/places/py.typed rename to packages/overture-schema-theme-places/src/overture/schema/places/py.typed diff --git a/packages/overture-schema-places-theme/tests/place_baseline_schema.json b/packages/overture-schema-theme-places/tests/place_baseline_schema.json similarity index 100% rename from packages/overture-schema-places-theme/tests/place_baseline_schema.json rename to packages/overture-schema-theme-places/tests/place_baseline_schema.json diff --git a/packages/overture-schema-places-theme/tests/test_place_json_schema_baseline.py b/packages/overture-schema-theme-places/tests/test_place_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-places-theme/tests/test_place_json_schema_baseline.py rename to packages/overture-schema-theme-places/tests/test_place_json_schema_baseline.py diff --git a/packages/overture-schema-transportation-theme/README.md b/packages/overture-schema-theme-transportation/README.md similarity index 100% rename from packages/overture-schema-transportation-theme/README.md rename to packages/overture-schema-theme-transportation/README.md diff --git a/packages/overture-schema-transportation-theme/changelog.d/557.misc.md b/packages/overture-schema-theme-transportation/changelog.d/557.misc.md similarity index 100% rename from packages/overture-schema-transportation-theme/changelog.d/557.misc.md rename to packages/overture-schema-theme-transportation/changelog.d/557.misc.md diff --git a/packages/overture-schema-theme-transportation/changelog.d/649.misc.md b/packages/overture-schema-theme-transportation/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema-theme-transportation/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema-transportation-theme/changelog.d/README.md b/packages/overture-schema-theme-transportation/changelog.d/README.md similarity index 100% rename from packages/overture-schema-transportation-theme/changelog.d/README.md rename to packages/overture-schema-theme-transportation/changelog.d/README.md diff --git a/packages/overture-schema-transportation-theme/pyproject.toml b/packages/overture-schema-theme-transportation/pyproject.toml similarity index 99% rename from packages/overture-schema-transportation-theme/pyproject.toml rename to packages/overture-schema-theme-transportation/pyproject.toml index 5fa8df617..596197bf4 100644 --- a/packages/overture-schema-transportation-theme/pyproject.toml +++ b/packages/overture-schema-theme-transportation/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ description = "Overture Maps transportation theme with shared structures and connector and segment types" version = "0.1.1" license = "MIT" -name = "overture-schema-transportation-theme" +name = "overture-schema-theme-transportation" readme = "README.md" requires-python = ">=3.10" diff --git a/packages/overture-schema-transportation-theme/src/overture/__init__.py b/packages/overture-schema-theme-transportation/src/overture/__init__.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/__init__.py rename to packages/overture-schema-theme-transportation/src/overture/__init__.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/__init__.py b/packages/overture-schema-theme-transportation/src/overture/schema/__init__.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/__init__.py rename to packages/overture-schema-theme-transportation/src/overture/schema/__init__.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/__init__.py b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/__init__.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/__init__.py rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/__init__.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/connector.py b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/connector.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/connector.py rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/connector.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/py.typed b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/py.typed similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/py.typed rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/py.typed diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/__init__.py b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/__init__.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/__init__.py rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/__init__.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/_common.py b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/_common.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/_common.py rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/_common.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/rail.py b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/rail.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/rail.py rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/rail.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/road.py b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/road.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/road.py rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/road.py diff --git a/packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/water.py b/packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/water.py similarity index 100% rename from packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/water.py rename to packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/water.py diff --git a/packages/overture-schema-transportation-theme/tests/connector_baseline_schema.json b/packages/overture-schema-theme-transportation/tests/connector_baseline_schema.json similarity index 100% rename from packages/overture-schema-transportation-theme/tests/connector_baseline_schema.json rename to packages/overture-schema-theme-transportation/tests/connector_baseline_schema.json diff --git a/packages/overture-schema-transportation-theme/tests/segment_baseline_schema.json b/packages/overture-schema-theme-transportation/tests/segment_baseline_schema.json similarity index 100% rename from packages/overture-schema-transportation-theme/tests/segment_baseline_schema.json rename to packages/overture-schema-theme-transportation/tests/segment_baseline_schema.json diff --git a/packages/overture-schema-transportation-theme/tests/test_connector_json_schema_baseline.py b/packages/overture-schema-theme-transportation/tests/test_connector_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-transportation-theme/tests/test_connector_json_schema_baseline.py rename to packages/overture-schema-theme-transportation/tests/test_connector_json_schema_baseline.py diff --git a/packages/overture-schema-transportation-theme/tests/test_segment_json_schema_baseline.py b/packages/overture-schema-theme-transportation/tests/test_segment_json_schema_baseline.py similarity index 100% rename from packages/overture-schema-transportation-theme/tests/test_segment_json_schema_baseline.py rename to packages/overture-schema-theme-transportation/tests/test_segment_json_schema_baseline.py diff --git a/packages/overture-schema/changelog.d/649.misc.md b/packages/overture-schema/changelog.d/649.misc.md new file mode 100644 index 000000000..23fd285d8 --- /dev/null +++ b/packages/overture-schema/changelog.d/649.misc.md @@ -0,0 +1 @@ +Rename theme packages to improve sorting and grouping characteristics. diff --git a/packages/overture-schema/pyproject.toml b/packages/overture-schema/pyproject.toml index e49866c40..22d67998b 100644 --- a/packages/overture-schema/pyproject.toml +++ b/packages/overture-schema/pyproject.toml @@ -3,12 +3,12 @@ maintainers = [ {name = "Overture Maps Schema Working Group"}, ] dependencies = [ - "overture-schema-addresses-theme>=0.1.1", - "overture-schema-base-theme>=0.1.1", - "overture-schema-buildings-theme>=0.1.1", - "overture-schema-divisions-theme>=0.1.1", - "overture-schema-places-theme>=0.1.1", - "overture-schema-transportation-theme>=0.1.1", + "overture-schema-theme-addresses>=0.1.1", + "overture-schema-theme-base>=0.1.1", + "overture-schema-theme-buildings>=0.1.1", + "overture-schema-theme-divisions>=0.1.1", + "overture-schema-theme-places>=0.1.1", + "overture-schema-theme-transportation>=0.1.1", "overture-schema-common>=0.1.1", "pydantic>=2.12.0", "pyyaml>=6.0.2", @@ -27,14 +27,14 @@ Source = "https://github.com/OvertureMaps/schema" Issues = "https://github.com/OvertureMaps/schema/issues" [tool.uv.sources] -overture-schema-addresses-theme = { workspace = true } -overture-schema-base-theme = { workspace = true } -overture-schema-buildings-theme = { workspace = true } overture-schema-cli = { workspace = true } overture-schema-common = { workspace = true } -overture-schema-divisions-theme = { workspace = true } -overture-schema-places-theme = { workspace = true } -overture-schema-transportation-theme = { workspace = true } +overture-schema-theme-addresses = { workspace = true } +overture-schema-theme-base = { workspace = true } +overture-schema-theme-buildings = { workspace = true } +overture-schema-theme-divisions = { workspace = true } +overture-schema-theme-places = { workspace = true } +overture-schema-theme-transportation = { workspace = true } [build-system] build-backend = "hatchling.build" diff --git a/pyproject.toml b/pyproject.toml index ae02f5090..9f5eea2bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,17 +65,17 @@ markers = [ "baseline: golden file baseline tests", ] pythonpath = [ - "packages/overture-schema-addresses-theme/tests", - "packages/overture-schema-base-theme/tests", - "packages/overture-schema-buildings-theme/tests", "packages/overture-schema-cli/tests", "packages/overture-schema-codegen/tests", "packages/overture-schema-common/tests", - "packages/overture-schema-divisions-theme/tests", - "packages/overture-schema-places-theme/tests", "packages/overture-schema-pyspark/tests", "packages/overture-schema-system/tests", - "packages/overture-schema-transportation-theme/tests", + "packages/overture-schema-theme-addresses/tests", + "packages/overture-schema-theme-base/tests", + "packages/overture-schema-theme-buildings/tests", + "packages/overture-schema-theme-divisions/tests", + "packages/overture-schema-theme-places/tests", + "packages/overture-schema-theme-transportation/tests", "packages/overture-schema/tests", ] verbosity_subtests = 0 diff --git a/uv.lock b/uv.lock index 58f793e83..4a025e9bc 100644 --- a/uv.lock +++ b/uv.lock @@ -15,17 +15,17 @@ exclude-newer-span = "P1W" [manifest] members = [ "overture-schema", - "overture-schema-addresses-theme", - "overture-schema-base-theme", - "overture-schema-buildings-theme", "overture-schema-cli", "overture-schema-codegen", "overture-schema-common", - "overture-schema-divisions-theme", - "overture-schema-places-theme", "overture-schema-pyspark", "overture-schema-system", - "overture-schema-transportation-theme", + "overture-schema-theme-addresses", + "overture-schema-theme-base", + "overture-schema-theme-buildings", + "overture-schema-theme-divisions", + "overture-schema-theme-places", + "overture-schema-theme-transportation", "overture-schema-workspace", ] @@ -895,14 +895,14 @@ name = "overture-schema" version = "1.17.1" source = { editable = "packages/overture-schema" } dependencies = [ - { name = "overture-schema-addresses-theme" }, - { name = "overture-schema-base-theme" }, - { name = "overture-schema-buildings-theme" }, { name = "overture-schema-cli" }, { name = "overture-schema-common" }, - { name = "overture-schema-divisions-theme" }, - { name = "overture-schema-places-theme" }, - { name = "overture-schema-transportation-theme" }, + { name = "overture-schema-theme-addresses" }, + { name = "overture-schema-theme-base" }, + { name = "overture-schema-theme-buildings" }, + { name = "overture-schema-theme-divisions" }, + { name = "overture-schema-theme-places" }, + { name = "overture-schema-theme-transportation" }, { name = "pydantic" }, { name = "pyyaml" }, ] @@ -916,14 +916,14 @@ dev = [ [package.metadata] requires-dist = [ - { name = "overture-schema-addresses-theme", editable = "packages/overture-schema-addresses-theme" }, - { name = "overture-schema-base-theme", editable = "packages/overture-schema-base-theme" }, - { name = "overture-schema-buildings-theme", editable = "packages/overture-schema-buildings-theme" }, { name = "overture-schema-cli", editable = "packages/overture-schema-cli" }, { name = "overture-schema-common", editable = "packages/overture-schema-common" }, - { name = "overture-schema-divisions-theme", editable = "packages/overture-schema-divisions-theme" }, - { name = "overture-schema-places-theme", editable = "packages/overture-schema-places-theme" }, - { name = "overture-schema-transportation-theme", editable = "packages/overture-schema-transportation-theme" }, + { name = "overture-schema-theme-addresses", editable = "packages/overture-schema-theme-addresses" }, + { name = "overture-schema-theme-base", editable = "packages/overture-schema-theme-base" }, + { name = "overture-schema-theme-buildings", editable = "packages/overture-schema-theme-buildings" }, + { name = "overture-schema-theme-divisions", editable = "packages/overture-schema-theme-divisions" }, + { name = "overture-schema-theme-places", editable = "packages/overture-schema-theme-places" }, + { name = "overture-schema-theme-transportation", editable = "packages/overture-schema-theme-transportation" }, { name = "pydantic", specifier = ">=2.12.0" }, { name = "pyyaml", specifier = ">=6.0.2" }, ] @@ -935,57 +935,6 @@ dev = [ { name = "yamlcore", specifier = ">=0.0.4" }, ] -[[package]] -name = "overture-schema-addresses-theme" -version = "0.1.1" -source = { editable = "packages/overture-schema-addresses-theme" } -dependencies = [ - { name = "overture-schema-common" }, - { name = "overture-schema-system" }, - { name = "pydantic" }, -] - -[package.metadata] -requires-dist = [ - { name = "overture-schema-common", editable = "packages/overture-schema-common" }, - { name = "overture-schema-system", editable = "packages/overture-schema-system" }, - { name = "pydantic", specifier = ">=2.12.0" }, -] - -[[package]] -name = "overture-schema-base-theme" -version = "0.1.1" -source = { editable = "packages/overture-schema-base-theme" } -dependencies = [ - { name = "overture-schema-common" }, - { name = "overture-schema-system" }, - { name = "pydantic" }, -] - -[package.metadata] -requires-dist = [ - { name = "overture-schema-common", editable = "packages/overture-schema-common" }, - { name = "overture-schema-system", editable = "packages/overture-schema-system" }, - { name = "pydantic", specifier = ">=2.12.0" }, -] - -[[package]] -name = "overture-schema-buildings-theme" -version = "0.1.1" -source = { editable = "packages/overture-schema-buildings-theme" } -dependencies = [ - { name = "overture-schema-common" }, - { name = "overture-schema-system" }, - { name = "pydantic" }, -] - -[package.metadata] -requires-dist = [ - { name = "overture-schema-common", editable = "packages/overture-schema-common" }, - { name = "overture-schema-system", editable = "packages/overture-schema-system" }, - { name = "pydantic", specifier = ">=2.12.0" }, -] - [[package]] name = "overture-schema-cli" version = "0.1.1" @@ -1041,12 +990,12 @@ dependencies = [ [package.dev-dependencies] test = [ - { name = "overture-schema-addresses-theme" }, - { name = "overture-schema-base-theme" }, - { name = "overture-schema-buildings-theme" }, - { name = "overture-schema-divisions-theme" }, - { name = "overture-schema-places-theme" }, - { name = "overture-schema-transportation-theme" }, + { name = "overture-schema-theme-addresses" }, + { name = "overture-schema-theme-base" }, + { name = "overture-schema-theme-buildings" }, + { name = "overture-schema-theme-divisions" }, + { name = "overture-schema-theme-places" }, + { name = "overture-schema-theme-transportation" }, ] [package.metadata] @@ -1062,12 +1011,12 @@ requires-dist = [ [package.metadata.requires-dev] test = [ - { name = "overture-schema-addresses-theme", editable = "packages/overture-schema-addresses-theme" }, - { name = "overture-schema-base-theme", editable = "packages/overture-schema-base-theme" }, - { name = "overture-schema-buildings-theme", editable = "packages/overture-schema-buildings-theme" }, - { name = "overture-schema-divisions-theme", editable = "packages/overture-schema-divisions-theme" }, - { name = "overture-schema-places-theme", editable = "packages/overture-schema-places-theme" }, - { name = "overture-schema-transportation-theme", editable = "packages/overture-schema-transportation-theme" }, + { name = "overture-schema-theme-addresses", editable = "packages/overture-schema-theme-addresses" }, + { name = "overture-schema-theme-base", editable = "packages/overture-schema-theme-base" }, + { name = "overture-schema-theme-buildings", editable = "packages/overture-schema-theme-buildings" }, + { name = "overture-schema-theme-divisions", editable = "packages/overture-schema-theme-divisions" }, + { name = "overture-schema-theme-places", editable = "packages/overture-schema-theme-places" }, + { name = "overture-schema-theme-transportation", editable = "packages/overture-schema-theme-transportation" }, ] [[package]] @@ -1102,9 +1051,57 @@ dev = [ ] [[package]] -name = "overture-schema-divisions-theme" +name = "overture-schema-pyspark" +version = "0.1.1" +source = { editable = "packages/overture-schema-pyspark" } +dependencies = [ + { name = "click" }, + { name = "overture-schema-system" }, + { name = "pyspark" }, +] + +[package.metadata] +requires-dist = [ + { name = "click", specifier = ">=8.0" }, + { name = "overture-schema-system", editable = "packages/overture-schema-system" }, + { name = "pyspark", specifier = ">=3.4" }, +] + +[[package]] +name = "overture-schema-system" +version = "0.1.1" +source = { editable = "packages/overture-schema-system" } +dependencies = [ + { name = "pydantic" }, + { name = "shapely" }, + { name = "typing-extensions" }, +] + +[package.dev-dependencies] +dev = [ + { name = "mypy" }, + { name = "pytest" }, + { name = "ruff" }, +] + +[package.metadata] +requires-dist = [ + { name = "pydantic", specifier = ">=2.12.0" }, + { name = "shapely", specifier = ">=2.0.0" }, + { name = "typing-extensions", specifier = ">=4.16" }, +] + +[package.metadata.requires-dev] +dev = [ + { name = "mypy", specifier = ">=1.17.0" }, + { name = "pytest", specifier = ">=9.0.0" }, + { name = "ruff", specifier = ">=0.13.0" }, +] + +[[package]] +name = "overture-schema-theme-addresses" version = "0.1.1" -source = { editable = "packages/overture-schema-divisions-theme" } +source = { editable = "packages/overture-schema-theme-addresses" } dependencies = [ { name = "overture-schema-common" }, { name = "overture-schema-system" }, @@ -1119,74 +1116,77 @@ requires-dist = [ ] [[package]] -name = "overture-schema-places-theme" +name = "overture-schema-theme-base" version = "0.1.1" -source = { editable = "packages/overture-schema-places-theme" } +source = { editable = "packages/overture-schema-theme-base" } dependencies = [ { name = "overture-schema-common" }, { name = "overture-schema-system" }, - { name = "pydantic", extra = ["email"] }, + { name = "pydantic" }, ] [package.metadata] requires-dist = [ { name = "overture-schema-common", editable = "packages/overture-schema-common" }, { name = "overture-schema-system", editable = "packages/overture-schema-system" }, - { name = "pydantic", extras = ["email"], specifier = ">=2.12.0" }, + { name = "pydantic", specifier = ">=2.12.0" }, ] [[package]] -name = "overture-schema-pyspark" +name = "overture-schema-theme-buildings" version = "0.1.1" -source = { editable = "packages/overture-schema-pyspark" } +source = { editable = "packages/overture-schema-theme-buildings" } dependencies = [ - { name = "click" }, + { name = "overture-schema-common" }, { name = "overture-schema-system" }, - { name = "pyspark" }, + { name = "pydantic" }, ] [package.metadata] requires-dist = [ - { name = "click", specifier = ">=8.0" }, + { name = "overture-schema-common", editable = "packages/overture-schema-common" }, { name = "overture-schema-system", editable = "packages/overture-schema-system" }, - { name = "pyspark", specifier = ">=3.4" }, + { name = "pydantic", specifier = ">=2.12.0" }, ] [[package]] -name = "overture-schema-system" +name = "overture-schema-theme-divisions" version = "0.1.1" -source = { editable = "packages/overture-schema-system" } +source = { editable = "packages/overture-schema-theme-divisions" } dependencies = [ + { name = "overture-schema-common" }, + { name = "overture-schema-system" }, { name = "pydantic" }, - { name = "shapely" }, - { name = "typing-extensions" }, -] - -[package.dev-dependencies] -dev = [ - { name = "mypy" }, - { name = "pytest" }, - { name = "ruff" }, ] [package.metadata] requires-dist = [ + { name = "overture-schema-common", editable = "packages/overture-schema-common" }, + { name = "overture-schema-system", editable = "packages/overture-schema-system" }, { name = "pydantic", specifier = ">=2.12.0" }, - { name = "shapely", specifier = ">=2.0.0" }, - { name = "typing-extensions", specifier = ">=4.16" }, ] -[package.metadata.requires-dev] -dev = [ - { name = "mypy", specifier = ">=1.17.0" }, - { name = "pytest", specifier = ">=9.0.0" }, - { name = "ruff", specifier = ">=0.13.0" }, +[[package]] +name = "overture-schema-theme-places" +version = "0.1.1" +source = { editable = "packages/overture-schema-theme-places" } +dependencies = [ + { name = "overture-schema-common" }, + { name = "overture-schema-system" }, + { name = "pydantic", extra = ["email"] }, +] + +[package.metadata] +requires-dist = [ + { name = "overture-schema-common", editable = "packages/overture-schema-common" }, + { name = "overture-schema-system", editable = "packages/overture-schema-system" }, + { name = "pydantic", extras = ["email"], specifier = ">=2.12.0" }, ] [[package]] -name = "overture-schema-transportation-theme" +name = "overture-schema-theme-transportation" version = "0.1.1" -source = { editable = "packages/overture-schema-transportation-theme" } +source = { editable = "packages/overture-schema-theme-transportation" } dependencies = [ { name = "overture-schema-common" }, { name = "overture-schema-system" },