Skip to content

Sync upstream 231212 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
connorjcantrell wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Sync upstream 231212 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80edee0
Merge pull request #4 from BrickSchema/master
jbkoh Sep 20, 2023
36e645b
Merge pull request #5 from mapped/sync-with-upstream-230928
connorjcantrell Sep 28, 2023
dfe0985
Merge remote-tracking branch 'upstream/master'
connorjcantrell Nov 14, 2023
4d42a16
Merge pull request #6 from mapped/sync-with-upstream-231114
connorjcantrell Nov 14, 2023
b9cccb8
Merge branch 'master' of https://github.com/BrickSchema/Brick into up…
connorjcantrell Dec 5, 2023
f66670a
Merge pull request #7 from mapped/update-master
connorjcantrell Dec 5, 2023
744612b
Merge remote-tracking branch 'upstream/master' into sync-upstream-231212
connorjcantrell Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bricksrc/deprecations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
from .namespaces import BRICK, RDFS, SKOS, A

deprecations = {
BRICK.Condenser: {
"version": "1.3.0",
"mitigation_message": "'Condenser' and 'Condensing Unit' are interchangable terms. Renaming class to 'Condensing_Unit' to further aligns with ASHRAE's terminology.",
"replace_with": BRICK.Condensing_Unit,
},
BRICK.Solar_Radiance_Sensor: {
"version": "1.3.0",
"mitigation_message": "The class 'Solar_Radiance_Sensor' is deprecated in favor of 'Solar_Irradiance_Sensor'. The new name better reflects the standard unit of measurement, watts per square meter (W/m²), and aligns with the terminology commonly used in solar applications.",
Expand Down
2 changes: 1 addition & 1 deletion bricksrc/equipment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@
"Relief_Damper": {"tags": [TAG.Equipment, TAG.Damper, TAG.Relief]},
},
},
"Condenser": {"tags": [TAG.Equipment, TAG.Condenser]},
"Condensing_Unit": {"tags": [TAG.Equipment, TAG.Condenser, TAG.Condensing, TAG.Unit]},
"Computer_Room_Air_Conditioning": {
"tags": [
TAG.Equipment,
Expand Down