From 821b40644095c573f28e5e5623639e9813b07929 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 9 Jan 2020 21:49:52 -0500 Subject: [PATCH] fix(rename): Update files for name change to honeybee_schema This commit brings all of the files of the repo in line with the name change to honeybee_schema. --- CODE_OF_CONDUCT.md | 3 ++- CONTRIBUTING.md | 7 +++++-- LICENSE | 2 +- README.md | 20 +++++++++---------- docs.py | 6 +++--- .../__init__.py | 0 .../_base.py | 0 .../_openapi.py | 4 ++-- .../bc.py | 0 .../datetime.py | 0 .../energy/__init__.py | 0 .../energy/_base.py | 0 .../energy/construction.py | 0 .../energy/constructionset.py | 0 .../energy/designday.py | 0 .../energy/hvac.py | 0 .../energy/load.py | 0 .../energy/material.py | 0 .../energy/programtype.py | 0 .../energy/properties.py | 0 .../energy/schedule.py | 0 .../energy/simulation.py | 0 .../model.py | 0 .../samples/aperture_set.json | 0 .../samples/construction_door.json | 0 .../samples/construction_internal_floor.json | 0 .../samples/construction_roof.json | 0 .../samples/construction_set.json | 0 .../samples/construction_set_1.json | 0 .../samples/construction_wall.json | 0 .../samples/construction_window.json | 0 .../samples/construction_window2.json | 0 .../samples/construction_window_blind.json | 0 .../samples/door_set.json | 0 .../electrical_equipment_abridged.json | 0 .../samples/floor_set.json | 0 .../samples/ideal_air_detailed.json | 0 .../samples/lighting_abridged.json | 0 .../samples/material_concrete.json | 0 .../samples/material_gypsum.json | 0 .../samples/material_insulation.json | 0 .../samples/material_metal_decking.json | 0 .../samples/material_no_mass.json | 0 .../samples/material_roof_insulation.json | 0 .../samples/material_roof_membrane.json | 0 .../samples/material_stucco.json | 0 .../model_complete_multi_zone_office.json | 0 .../model_complete_single_zone_office.json | 0 ...ete_single_zone_office_detailed_loads.json | 0 ...ete_single_zone_office_fixed_interval.json | 0 ...odel_complete_with_humidity_setpoints.json | 0 .../model_multi_zone_single_family_house.json | 0 .../samples/model_shoe_box.json | 0 .../samples/model_single_zone_tiny_house.json | 0 .../samples/people_abridged.json | 0 .../samples/roof_ceiling_set.json | 0 .../samples/schedule_fixed_interval.json | 0 .../samples/schedule_fixed_interval1.json | 0 ...ixedinterval_increasing_fine_timestep.json | 0 ...e_fixedinterval_increasing_single_day.json | 0 .../schedule_fixedinterval_random_annual.json | 0 .../schedule_fixedinterval_simple.json | 0 .../schedule_primary_school_occupancy.json | 0 .../schedule_ruleset_office_occupancy.json | 0 ...dule_ruleset_primary_school_occupancy.json | 0 .../schedule_ruleset_simple_repeating.json | 0 .../scheduletypelimit_temperature.json | 0 .../samples/simulation_par_detailed.json | 0 .../samples/simulation_par_simple.json | 0 .../samples/wall_set.json | 0 .../samples/window_blind.json | 0 .../samples/window_gas.json | 0 .../samples/window_gas_custom.json | 0 .../samples/window_gas_mixture.json | 0 .../samples/window_glazing.json | 0 .../samples/window_shade.json | 0 .../samples/window_simpleglazing.json | 0 setup.py | 4 ++-- tests/test_construction.py | 4 ++-- tests/test_constructionset.py | 4 ++-- tests/test_hvac.py | 4 ++-- tests/test_load.py | 4 ++-- tests/test_material.py | 4 ++-- tests/test_model.py | 4 ++-- tests/test_schedule.py | 4 ++-- tests/test_simulation.py | 4 ++-- 86 files changed, 41 insertions(+), 37 deletions(-) rename {honeybee_model_schema => honeybee_schema}/__init__.py (100%) rename {honeybee_model_schema => honeybee_schema}/_base.py (100%) rename {honeybee_model_schema => honeybee_schema}/_openapi.py (95%) rename {honeybee_model_schema => honeybee_schema}/bc.py (100%) rename {honeybee_model_schema => honeybee_schema}/datetime.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/__init__.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/_base.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/construction.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/constructionset.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/designday.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/hvac.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/load.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/material.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/programtype.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/properties.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/schedule.py (100%) rename {honeybee_model_schema => honeybee_schema}/energy/simulation.py (100%) rename {honeybee_model_schema => honeybee_schema}/model.py (100%) rename {honeybee_model_schema => honeybee_schema}/samples/aperture_set.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_door.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_internal_floor.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_roof.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_set.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_set_1.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_wall.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_window.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_window2.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/construction_window_blind.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/door_set.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/electrical_equipment_abridged.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/floor_set.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/ideal_air_detailed.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/lighting_abridged.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_concrete.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_gypsum.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_insulation.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_metal_decking.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_no_mass.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_roof_insulation.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_roof_membrane.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/material_stucco.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_complete_multi_zone_office.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_complete_single_zone_office.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_complete_single_zone_office_detailed_loads.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_complete_single_zone_office_fixed_interval.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_complete_with_humidity_setpoints.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_multi_zone_single_family_house.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_shoe_box.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/model_single_zone_tiny_house.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/people_abridged.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/roof_ceiling_set.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_fixed_interval.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_fixed_interval1.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_fixedinterval_increasing_fine_timestep.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_fixedinterval_increasing_single_day.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_fixedinterval_random_annual.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_fixedinterval_simple.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_primary_school_occupancy.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_ruleset_office_occupancy.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_ruleset_primary_school_occupancy.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/schedule_ruleset_simple_repeating.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/scheduletypelimit_temperature.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/simulation_par_detailed.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/simulation_par_simple.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/wall_set.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/window_blind.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/window_gas.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/window_gas_custom.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/window_gas_mixture.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/window_glazing.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/window_shade.json (100%) rename {honeybee_model_schema => honeybee_schema}/samples/window_simpleglazing.json (100%) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 16811de..1b0b830 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,5 @@ Contributor Covenant Code of Conduct ========================================= -This project follows Ladybug Tools contributor covenant code of conduct. See our [contributor covenant code of conduct](https://github.com/ladybug-tools/contributing/blob/master/CODE-OF-CONDUCT.md). +This project follows Ladybug Tools contributor covenant code of conduct. +See our [contributor covenant code of conduct](https://github.com/ladybug-tools/contributing/blob/master/CODE-OF-CONDUCT.md). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b45e4ab..273ec2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,9 @@ Contributing ------------ -We welcome contributions from anyone, even if you are new to open source we will be happy to help you to get started. Most of the Ladybug Tools developers started learning programming through developing for Ladybug Tools. +We welcome contributions from anyone, even if you are new to open source we will +be happy to help you to get started. Most of the Ladybug Tools developers started +learning programming through developing for Ladybug Tools. ### Code contribution -This project follows Ladybug Tools contributing guideline. See [contributing to Ladybug Tools projects](https://github.com/ladybug-tools/contributing/blob/master/README.md). +This project follows Ladybug Tools contributing guideline. +See [contributing to Ladybug Tools projects](https://github.com/ladybug-tools/contributing/blob/master/README.md). diff --git a/LICENSE b/LICENSE index 0182848..4caff7e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Ladybug Tools Energy Model Schema, Copyright (c) 2019, Alliance for Sustainable Energy, LLC, Ladybug Tools LLC +Honeybee Schema, Copyright (c) 2019, Alliance for Sustainable Energy, LLC, Ladybug Tools LLC and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the diff --git a/README.md b/README.md index b23f661..cc58500 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,41 @@ -[![Build Status](https://travis-ci.org/ladybug-tools-in2/honeybee-model-schema.svg?branch=master)](https://travis-ci.org/ladybug-tools-in2/honeybee-model-schema) -[![Coverage Status](https://coveralls.io/repos/github/ladybug-tools-in2/honeybee-model-schema/badge.svg?branch=master)](https://coveralls.io/github/ladybug-tools-in2/honeybee-model-schema) +[![Build Status](https://travis-ci.org/ladybug-tools-in2/honeybee-schema.svg?branch=master)](https://travis-ci.org/ladybug-tools-in2/honeybee-schema) +[![Coverage Status](https://coveralls.io/repos/github/ladybug-tools-in2/honeybee-schema/badge.svg?branch=master)](https://coveralls.io/github/ladybug-tools-in2/honeybee-schema) [![Python 2.7](https://img.shields.io/badge/python-2.7-green.svg)](https://www.python.org/downloads/release/python-270/) [![Python 3.6](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/) -# honeybee-model-schema +# honeybee-schema Honeybee Data-Model Objects ## Installation ```console -pip install honeybee-model-schema +pip install honeybee-schema ``` ## QuickStart ```python -import honeybee_model_schema +import honeybee_schema ``` ## API Documentation -[Model Schema](https://ladybug-tools-in2.github.io/honeybee-model-schema/model.html) +[Model Schema](https://ladybug-tools-in2.github.io/honeybee-schema/model.html) -[Energy Simulation Parameter Schema](https://ladybug-tools-in2.github.io/honeybee-model-schema/simulation-parameter.html) +[Energy Simulation Parameter Schema](https://ladybug-tools-in2.github.io/honeybee-schema/simulation-parameter.html) ## Local Development 1. Clone this repo locally ```console -git clone git@github.com:ladybug-tools-in2/honeybee-model-schema +git clone git@github.com:ladybug-tools-in2/honeybee-schema # or -git clone https://github.com/ladybug-tools-in2/honeybee-model-schema +git clone https://github.com/ladybug-tools-in2/honeybee-schema ``` 2. Install dependencies: ```console -cd honeybee-model-schema +cd honeybee-schema pip install -r dev-requirements.txt pip install -r requirements.txt ``` diff --git a/docs.py b/docs.py index 6420732..ecc635f 100644 --- a/docs.py +++ b/docs.py @@ -1,7 +1,7 @@ """generate openapi docs.""" -from honeybee_model_schema._openapi import get_openapi -from honeybee_model_schema.model import Model -from honeybee_model_schema.energy.simulation import SimulationParameter +from honeybee_schema._openapi import get_openapi +from honeybee_schema.model import Model +from honeybee_schema.energy.simulation import SimulationParameter import json diff --git a/honeybee_model_schema/__init__.py b/honeybee_schema/__init__.py similarity index 100% rename from honeybee_model_schema/__init__.py rename to honeybee_schema/__init__.py diff --git a/honeybee_model_schema/_base.py b/honeybee_schema/_base.py similarity index 100% rename from honeybee_model_schema/_base.py rename to honeybee_schema/_base.py diff --git a/honeybee_model_schema/_openapi.py b/honeybee_schema/_openapi.py similarity index 95% rename from honeybee_model_schema/_openapi.py rename to honeybee_schema/_openapi.py index b39be0f..e4005e6 100644 --- a/honeybee_model_schema/_openapi.py +++ b/honeybee_schema/_openapi.py @@ -13,7 +13,7 @@ "contact": { "name": "Ladybug Tools", "email": "info@ladybug.tools", - "url": "https://github.com/ladybug-tools/honeybee" + "url": "https://github.com/ladybug-tools/honeybee-core" }, "x-logo": { "url": "https://www.ladybug.tools/assets/img/honeybee-large.png", @@ -21,7 +21,7 @@ }, "license": { "name": "BSD", - "url": "https://github.com/ladybug-tools-in2/honeybee-model-schema/blob/master/LICENSE" + "url": "https://github.com/ladybug-tools-in2/honeybee-schema/blob/master/LICENSE" } }, "externalDocs": { diff --git a/honeybee_model_schema/bc.py b/honeybee_schema/bc.py similarity index 100% rename from honeybee_model_schema/bc.py rename to honeybee_schema/bc.py diff --git a/honeybee_model_schema/datetime.py b/honeybee_schema/datetime.py similarity index 100% rename from honeybee_model_schema/datetime.py rename to honeybee_schema/datetime.py diff --git a/honeybee_model_schema/energy/__init__.py b/honeybee_schema/energy/__init__.py similarity index 100% rename from honeybee_model_schema/energy/__init__.py rename to honeybee_schema/energy/__init__.py diff --git a/honeybee_model_schema/energy/_base.py b/honeybee_schema/energy/_base.py similarity index 100% rename from honeybee_model_schema/energy/_base.py rename to honeybee_schema/energy/_base.py diff --git a/honeybee_model_schema/energy/construction.py b/honeybee_schema/energy/construction.py similarity index 100% rename from honeybee_model_schema/energy/construction.py rename to honeybee_schema/energy/construction.py diff --git a/honeybee_model_schema/energy/constructionset.py b/honeybee_schema/energy/constructionset.py similarity index 100% rename from honeybee_model_schema/energy/constructionset.py rename to honeybee_schema/energy/constructionset.py diff --git a/honeybee_model_schema/energy/designday.py b/honeybee_schema/energy/designday.py similarity index 100% rename from honeybee_model_schema/energy/designday.py rename to honeybee_schema/energy/designday.py diff --git a/honeybee_model_schema/energy/hvac.py b/honeybee_schema/energy/hvac.py similarity index 100% rename from honeybee_model_schema/energy/hvac.py rename to honeybee_schema/energy/hvac.py diff --git a/honeybee_model_schema/energy/load.py b/honeybee_schema/energy/load.py similarity index 100% rename from honeybee_model_schema/energy/load.py rename to honeybee_schema/energy/load.py diff --git a/honeybee_model_schema/energy/material.py b/honeybee_schema/energy/material.py similarity index 100% rename from honeybee_model_schema/energy/material.py rename to honeybee_schema/energy/material.py diff --git a/honeybee_model_schema/energy/programtype.py b/honeybee_schema/energy/programtype.py similarity index 100% rename from honeybee_model_schema/energy/programtype.py rename to honeybee_schema/energy/programtype.py diff --git a/honeybee_model_schema/energy/properties.py b/honeybee_schema/energy/properties.py similarity index 100% rename from honeybee_model_schema/energy/properties.py rename to honeybee_schema/energy/properties.py diff --git a/honeybee_model_schema/energy/schedule.py b/honeybee_schema/energy/schedule.py similarity index 100% rename from honeybee_model_schema/energy/schedule.py rename to honeybee_schema/energy/schedule.py diff --git a/honeybee_model_schema/energy/simulation.py b/honeybee_schema/energy/simulation.py similarity index 100% rename from honeybee_model_schema/energy/simulation.py rename to honeybee_schema/energy/simulation.py diff --git a/honeybee_model_schema/model.py b/honeybee_schema/model.py similarity index 100% rename from honeybee_model_schema/model.py rename to honeybee_schema/model.py diff --git a/honeybee_model_schema/samples/aperture_set.json b/honeybee_schema/samples/aperture_set.json similarity index 100% rename from honeybee_model_schema/samples/aperture_set.json rename to honeybee_schema/samples/aperture_set.json diff --git a/honeybee_model_schema/samples/construction_door.json b/honeybee_schema/samples/construction_door.json similarity index 100% rename from honeybee_model_schema/samples/construction_door.json rename to honeybee_schema/samples/construction_door.json diff --git a/honeybee_model_schema/samples/construction_internal_floor.json b/honeybee_schema/samples/construction_internal_floor.json similarity index 100% rename from honeybee_model_schema/samples/construction_internal_floor.json rename to honeybee_schema/samples/construction_internal_floor.json diff --git a/honeybee_model_schema/samples/construction_roof.json b/honeybee_schema/samples/construction_roof.json similarity index 100% rename from honeybee_model_schema/samples/construction_roof.json rename to honeybee_schema/samples/construction_roof.json diff --git a/honeybee_model_schema/samples/construction_set.json b/honeybee_schema/samples/construction_set.json similarity index 100% rename from honeybee_model_schema/samples/construction_set.json rename to honeybee_schema/samples/construction_set.json diff --git a/honeybee_model_schema/samples/construction_set_1.json b/honeybee_schema/samples/construction_set_1.json similarity index 100% rename from honeybee_model_schema/samples/construction_set_1.json rename to honeybee_schema/samples/construction_set_1.json diff --git a/honeybee_model_schema/samples/construction_wall.json b/honeybee_schema/samples/construction_wall.json similarity index 100% rename from honeybee_model_schema/samples/construction_wall.json rename to honeybee_schema/samples/construction_wall.json diff --git a/honeybee_model_schema/samples/construction_window.json b/honeybee_schema/samples/construction_window.json similarity index 100% rename from honeybee_model_schema/samples/construction_window.json rename to honeybee_schema/samples/construction_window.json diff --git a/honeybee_model_schema/samples/construction_window2.json b/honeybee_schema/samples/construction_window2.json similarity index 100% rename from honeybee_model_schema/samples/construction_window2.json rename to honeybee_schema/samples/construction_window2.json diff --git a/honeybee_model_schema/samples/construction_window_blind.json b/honeybee_schema/samples/construction_window_blind.json similarity index 100% rename from honeybee_model_schema/samples/construction_window_blind.json rename to honeybee_schema/samples/construction_window_blind.json diff --git a/honeybee_model_schema/samples/door_set.json b/honeybee_schema/samples/door_set.json similarity index 100% rename from honeybee_model_schema/samples/door_set.json rename to honeybee_schema/samples/door_set.json diff --git a/honeybee_model_schema/samples/electrical_equipment_abridged.json b/honeybee_schema/samples/electrical_equipment_abridged.json similarity index 100% rename from honeybee_model_schema/samples/electrical_equipment_abridged.json rename to honeybee_schema/samples/electrical_equipment_abridged.json diff --git a/honeybee_model_schema/samples/floor_set.json b/honeybee_schema/samples/floor_set.json similarity index 100% rename from honeybee_model_schema/samples/floor_set.json rename to honeybee_schema/samples/floor_set.json diff --git a/honeybee_model_schema/samples/ideal_air_detailed.json b/honeybee_schema/samples/ideal_air_detailed.json similarity index 100% rename from honeybee_model_schema/samples/ideal_air_detailed.json rename to honeybee_schema/samples/ideal_air_detailed.json diff --git a/honeybee_model_schema/samples/lighting_abridged.json b/honeybee_schema/samples/lighting_abridged.json similarity index 100% rename from honeybee_model_schema/samples/lighting_abridged.json rename to honeybee_schema/samples/lighting_abridged.json diff --git a/honeybee_model_schema/samples/material_concrete.json b/honeybee_schema/samples/material_concrete.json similarity index 100% rename from honeybee_model_schema/samples/material_concrete.json rename to honeybee_schema/samples/material_concrete.json diff --git a/honeybee_model_schema/samples/material_gypsum.json b/honeybee_schema/samples/material_gypsum.json similarity index 100% rename from honeybee_model_schema/samples/material_gypsum.json rename to honeybee_schema/samples/material_gypsum.json diff --git a/honeybee_model_schema/samples/material_insulation.json b/honeybee_schema/samples/material_insulation.json similarity index 100% rename from honeybee_model_schema/samples/material_insulation.json rename to honeybee_schema/samples/material_insulation.json diff --git a/honeybee_model_schema/samples/material_metal_decking.json b/honeybee_schema/samples/material_metal_decking.json similarity index 100% rename from honeybee_model_schema/samples/material_metal_decking.json rename to honeybee_schema/samples/material_metal_decking.json diff --git a/honeybee_model_schema/samples/material_no_mass.json b/honeybee_schema/samples/material_no_mass.json similarity index 100% rename from honeybee_model_schema/samples/material_no_mass.json rename to honeybee_schema/samples/material_no_mass.json diff --git a/honeybee_model_schema/samples/material_roof_insulation.json b/honeybee_schema/samples/material_roof_insulation.json similarity index 100% rename from honeybee_model_schema/samples/material_roof_insulation.json rename to honeybee_schema/samples/material_roof_insulation.json diff --git a/honeybee_model_schema/samples/material_roof_membrane.json b/honeybee_schema/samples/material_roof_membrane.json similarity index 100% rename from honeybee_model_schema/samples/material_roof_membrane.json rename to honeybee_schema/samples/material_roof_membrane.json diff --git a/honeybee_model_schema/samples/material_stucco.json b/honeybee_schema/samples/material_stucco.json similarity index 100% rename from honeybee_model_schema/samples/material_stucco.json rename to honeybee_schema/samples/material_stucco.json diff --git a/honeybee_model_schema/samples/model_complete_multi_zone_office.json b/honeybee_schema/samples/model_complete_multi_zone_office.json similarity index 100% rename from honeybee_model_schema/samples/model_complete_multi_zone_office.json rename to honeybee_schema/samples/model_complete_multi_zone_office.json diff --git a/honeybee_model_schema/samples/model_complete_single_zone_office.json b/honeybee_schema/samples/model_complete_single_zone_office.json similarity index 100% rename from honeybee_model_schema/samples/model_complete_single_zone_office.json rename to honeybee_schema/samples/model_complete_single_zone_office.json diff --git a/honeybee_model_schema/samples/model_complete_single_zone_office_detailed_loads.json b/honeybee_schema/samples/model_complete_single_zone_office_detailed_loads.json similarity index 100% rename from honeybee_model_schema/samples/model_complete_single_zone_office_detailed_loads.json rename to honeybee_schema/samples/model_complete_single_zone_office_detailed_loads.json diff --git a/honeybee_model_schema/samples/model_complete_single_zone_office_fixed_interval.json b/honeybee_schema/samples/model_complete_single_zone_office_fixed_interval.json similarity index 100% rename from honeybee_model_schema/samples/model_complete_single_zone_office_fixed_interval.json rename to honeybee_schema/samples/model_complete_single_zone_office_fixed_interval.json diff --git a/honeybee_model_schema/samples/model_complete_with_humidity_setpoints.json b/honeybee_schema/samples/model_complete_with_humidity_setpoints.json similarity index 100% rename from honeybee_model_schema/samples/model_complete_with_humidity_setpoints.json rename to honeybee_schema/samples/model_complete_with_humidity_setpoints.json diff --git a/honeybee_model_schema/samples/model_multi_zone_single_family_house.json b/honeybee_schema/samples/model_multi_zone_single_family_house.json similarity index 100% rename from honeybee_model_schema/samples/model_multi_zone_single_family_house.json rename to honeybee_schema/samples/model_multi_zone_single_family_house.json diff --git a/honeybee_model_schema/samples/model_shoe_box.json b/honeybee_schema/samples/model_shoe_box.json similarity index 100% rename from honeybee_model_schema/samples/model_shoe_box.json rename to honeybee_schema/samples/model_shoe_box.json diff --git a/honeybee_model_schema/samples/model_single_zone_tiny_house.json b/honeybee_schema/samples/model_single_zone_tiny_house.json similarity index 100% rename from honeybee_model_schema/samples/model_single_zone_tiny_house.json rename to honeybee_schema/samples/model_single_zone_tiny_house.json diff --git a/honeybee_model_schema/samples/people_abridged.json b/honeybee_schema/samples/people_abridged.json similarity index 100% rename from honeybee_model_schema/samples/people_abridged.json rename to honeybee_schema/samples/people_abridged.json diff --git a/honeybee_model_schema/samples/roof_ceiling_set.json b/honeybee_schema/samples/roof_ceiling_set.json similarity index 100% rename from honeybee_model_schema/samples/roof_ceiling_set.json rename to honeybee_schema/samples/roof_ceiling_set.json diff --git a/honeybee_model_schema/samples/schedule_fixed_interval.json b/honeybee_schema/samples/schedule_fixed_interval.json similarity index 100% rename from honeybee_model_schema/samples/schedule_fixed_interval.json rename to honeybee_schema/samples/schedule_fixed_interval.json diff --git a/honeybee_model_schema/samples/schedule_fixed_interval1.json b/honeybee_schema/samples/schedule_fixed_interval1.json similarity index 100% rename from honeybee_model_schema/samples/schedule_fixed_interval1.json rename to honeybee_schema/samples/schedule_fixed_interval1.json diff --git a/honeybee_model_schema/samples/schedule_fixedinterval_increasing_fine_timestep.json b/honeybee_schema/samples/schedule_fixedinterval_increasing_fine_timestep.json similarity index 100% rename from honeybee_model_schema/samples/schedule_fixedinterval_increasing_fine_timestep.json rename to honeybee_schema/samples/schedule_fixedinterval_increasing_fine_timestep.json diff --git a/honeybee_model_schema/samples/schedule_fixedinterval_increasing_single_day.json b/honeybee_schema/samples/schedule_fixedinterval_increasing_single_day.json similarity index 100% rename from honeybee_model_schema/samples/schedule_fixedinterval_increasing_single_day.json rename to honeybee_schema/samples/schedule_fixedinterval_increasing_single_day.json diff --git a/honeybee_model_schema/samples/schedule_fixedinterval_random_annual.json b/honeybee_schema/samples/schedule_fixedinterval_random_annual.json similarity index 100% rename from honeybee_model_schema/samples/schedule_fixedinterval_random_annual.json rename to honeybee_schema/samples/schedule_fixedinterval_random_annual.json diff --git a/honeybee_model_schema/samples/schedule_fixedinterval_simple.json b/honeybee_schema/samples/schedule_fixedinterval_simple.json similarity index 100% rename from honeybee_model_schema/samples/schedule_fixedinterval_simple.json rename to honeybee_schema/samples/schedule_fixedinterval_simple.json diff --git a/honeybee_model_schema/samples/schedule_primary_school_occupancy.json b/honeybee_schema/samples/schedule_primary_school_occupancy.json similarity index 100% rename from honeybee_model_schema/samples/schedule_primary_school_occupancy.json rename to honeybee_schema/samples/schedule_primary_school_occupancy.json diff --git a/honeybee_model_schema/samples/schedule_ruleset_office_occupancy.json b/honeybee_schema/samples/schedule_ruleset_office_occupancy.json similarity index 100% rename from honeybee_model_schema/samples/schedule_ruleset_office_occupancy.json rename to honeybee_schema/samples/schedule_ruleset_office_occupancy.json diff --git a/honeybee_model_schema/samples/schedule_ruleset_primary_school_occupancy.json b/honeybee_schema/samples/schedule_ruleset_primary_school_occupancy.json similarity index 100% rename from honeybee_model_schema/samples/schedule_ruleset_primary_school_occupancy.json rename to honeybee_schema/samples/schedule_ruleset_primary_school_occupancy.json diff --git a/honeybee_model_schema/samples/schedule_ruleset_simple_repeating.json b/honeybee_schema/samples/schedule_ruleset_simple_repeating.json similarity index 100% rename from honeybee_model_schema/samples/schedule_ruleset_simple_repeating.json rename to honeybee_schema/samples/schedule_ruleset_simple_repeating.json diff --git a/honeybee_model_schema/samples/scheduletypelimit_temperature.json b/honeybee_schema/samples/scheduletypelimit_temperature.json similarity index 100% rename from honeybee_model_schema/samples/scheduletypelimit_temperature.json rename to honeybee_schema/samples/scheduletypelimit_temperature.json diff --git a/honeybee_model_schema/samples/simulation_par_detailed.json b/honeybee_schema/samples/simulation_par_detailed.json similarity index 100% rename from honeybee_model_schema/samples/simulation_par_detailed.json rename to honeybee_schema/samples/simulation_par_detailed.json diff --git a/honeybee_model_schema/samples/simulation_par_simple.json b/honeybee_schema/samples/simulation_par_simple.json similarity index 100% rename from honeybee_model_schema/samples/simulation_par_simple.json rename to honeybee_schema/samples/simulation_par_simple.json diff --git a/honeybee_model_schema/samples/wall_set.json b/honeybee_schema/samples/wall_set.json similarity index 100% rename from honeybee_model_schema/samples/wall_set.json rename to honeybee_schema/samples/wall_set.json diff --git a/honeybee_model_schema/samples/window_blind.json b/honeybee_schema/samples/window_blind.json similarity index 100% rename from honeybee_model_schema/samples/window_blind.json rename to honeybee_schema/samples/window_blind.json diff --git a/honeybee_model_schema/samples/window_gas.json b/honeybee_schema/samples/window_gas.json similarity index 100% rename from honeybee_model_schema/samples/window_gas.json rename to honeybee_schema/samples/window_gas.json diff --git a/honeybee_model_schema/samples/window_gas_custom.json b/honeybee_schema/samples/window_gas_custom.json similarity index 100% rename from honeybee_model_schema/samples/window_gas_custom.json rename to honeybee_schema/samples/window_gas_custom.json diff --git a/honeybee_model_schema/samples/window_gas_mixture.json b/honeybee_schema/samples/window_gas_mixture.json similarity index 100% rename from honeybee_model_schema/samples/window_gas_mixture.json rename to honeybee_schema/samples/window_gas_mixture.json diff --git a/honeybee_model_schema/samples/window_glazing.json b/honeybee_schema/samples/window_glazing.json similarity index 100% rename from honeybee_model_schema/samples/window_glazing.json rename to honeybee_schema/samples/window_glazing.json diff --git a/honeybee_model_schema/samples/window_shade.json b/honeybee_schema/samples/window_shade.json similarity index 100% rename from honeybee_model_schema/samples/window_shade.json rename to honeybee_schema/samples/window_shade.json diff --git a/honeybee_model_schema/samples/window_simpleglazing.json b/honeybee_schema/samples/window_simpleglazing.json similarity index 100% rename from honeybee_model_schema/samples/window_simpleglazing.json rename to honeybee_schema/samples/window_simpleglazing.json diff --git a/setup.py b/setup.py index 065b32b..fc0135b 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ requirements = f.read().splitlines() setuptools.setup( - name="honeybee-model-schema", + name="honeybee-schema", use_scm_version = True, setup_requires=['setuptools_scm'], author="Ladybug Tools", @@ -16,7 +16,7 @@ description="Honeybee Data-Model Objects", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/ladybug-tools-in2/honeybee-model-schema", + url="https://github.com/ladybug-tools-in2/honeybee-schema", packages=setuptools.find_packages(exclude=["tests"]), install_requires=requirements, classifiers=[ diff --git a/tests/test_construction.py b/tests/test_construction.py index 2dbda86..c2ae1e3 100644 --- a/tests/test_construction.py +++ b/tests/test_construction.py @@ -1,4 +1,4 @@ -from honeybee_model_schema.energy.construction import OpaqueConstructionAbridged, \ +from honeybee_schema.energy.construction import OpaqueConstructionAbridged, \ WindowConstructionAbridged from copy import copy from pydantic import ValidationError @@ -8,7 +8,7 @@ # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_construction_window(): diff --git a/tests/test_constructionset.py b/tests/test_constructionset.py index cbfcfc2..0dc58f3 100644 --- a/tests/test_constructionset.py +++ b/tests/test_constructionset.py @@ -1,11 +1,11 @@ -from honeybee_model_schema.energy.constructionset import ConstructionSetAbridged, \ +from honeybee_schema.energy.constructionset import ConstructionSetAbridged, \ WallSetAbridged, RoofCeilingSetAbridged, FloorSetAbridged, ApertureSetAbridged, \ DoorSetAbridged import os # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_construction_set(): diff --git a/tests/test_hvac.py b/tests/test_hvac.py index 153c7f5..d010113 100644 --- a/tests/test_hvac.py +++ b/tests/test_hvac.py @@ -1,9 +1,9 @@ -from honeybee_model_schema.energy.hvac import IdealAirSystem +from honeybee_schema.energy.hvac import IdealAirSystem import os # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_detailed_air(): diff --git a/tests/test_load.py b/tests/test_load.py index b7ea56c..6a43020 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -1,9 +1,9 @@ -from honeybee_model_schema.energy.load import LightingAbridged +from honeybee_schema.energy.load import LightingAbridged import os # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_lighting(): file_path = os.path.join( diff --git a/tests/test_material.py b/tests/test_material.py index 1510cb4..72c7086 100644 --- a/tests/test_material.py +++ b/tests/test_material.py @@ -1,4 +1,4 @@ -from honeybee_model_schema.energy.material import EnergyMaterial, EnergyMaterialNoMass, \ +from honeybee_schema.energy.material import EnergyMaterial, EnergyMaterialNoMass, \ EnergyWindowMaterialGas, EnergyWindowMaterialGasMixture, \ EnergyWindowMaterialGasCustom, EnergyWindowMaterialBlind, \ EnergyWindowMaterialGlazing, EnergyWindowMaterialShade, \ @@ -11,7 +11,7 @@ # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_windowglazing(): diff --git a/tests/test_model.py b/tests/test_model.py index 49f255f..357d8ff 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1,9 +1,9 @@ -from honeybee_model_schema.model import Model +from honeybee_schema.model import Model import os # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_model_multi_zone_single_family_house(): diff --git a/tests/test_schedule.py b/tests/test_schedule.py index 6e08e3e..617451e 100644 --- a/tests/test_schedule.py +++ b/tests/test_schedule.py @@ -1,10 +1,10 @@ -from honeybee_model_schema.energy.schedule import ScheduleRulesetAbridged, \ +from honeybee_schema.energy.schedule import ScheduleRulesetAbridged, \ ScheduleFixedIntervalAbridged import os # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_ruleset_office_occupancy(): diff --git a/tests/test_simulation.py b/tests/test_simulation.py index a1790fb..c6f7585 100644 --- a/tests/test_simulation.py +++ b/tests/test_simulation.py @@ -1,9 +1,9 @@ -from honeybee_model_schema.energy.simulation import SimulationParameter +from honeybee_schema.energy.simulation import SimulationParameter import os # target folder where all of the samples live root = os.path.dirname(os.path.dirname(__file__)) -target_folder = os.path.join(root, 'honeybee_model_schema', 'samples') +target_folder = os.path.join(root, 'honeybee_schema', 'samples') def test_detailed_simulation_par():