nlr-cmei updates (#225)

kflemin · axelstudios · web-flow · commit a478deb222a8 · 2026-04-17T09:05:19.000-06:00
* nlr-cmei updates

* one more

* update tox?

* tox fix

* update setup python ci

* Remove stopit to get rid of the pkg_resources import that is broken with the latest setuptools

---------

Co-authored-by: Alex Swindler &lt;Alex.Swindler@nlr.gov&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # VERSION 0.2
-# AUTHOR:           Nicholas Long <nicholas.long@nrel.gov>
+# AUTHOR:           Nicholas Long <nicholas.long@nlr.gov>
 # DESCRIPTION:      Dockerfile for running BuildingSync Website with Python 3.9+
 # TO_BUILD_AND_RUN: docker-compose build && docker-compose up
 FROM alpine:3.18
diff --git a/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v0.2.0.xsd b/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v0.2.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 (x64) (http://www.altova.com) by Nicholas Long (NREL) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:auc="http://nrel.gov/schemas/bedes-auc/2014" targetNamespace="http://nrel.gov/schemas/bedes-auc/2014" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<!-- edited with XMLSpy v2016 rel. 2 (x64) (http://www.altova.com) by Nicholas Long (NLR) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:auc="http://nlr.gov/schemas/bedes-auc/2014" targetNamespace="http://nlr.gov/schemas/bedes-auc/2014" elementFormDefault="qualified" attributeFormDefault="unqualified">
   <xs:annotation>
     <xs:documentation>BuildingSync Schema - Version 0.2 (May 22, 2016)</xs:documentation>
   </xs:annotation>
diff --git a/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v0.3.0.xsd b/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v0.3.0.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:auc="http://nrel.gov/schemas/bedes-auc/2014" targetNamespace="http://nrel.gov/schemas/bedes-auc/2014" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:auc="http://nlr.gov/schemas/bedes-auc/2014" targetNamespace="http://nlr.gov/schemas/bedes-auc/2014" elementFormDefault="qualified" attributeFormDefault="unqualified">
   <xs:annotation>
     <xs:documentation>BuildingSync Schema - Version 0.3 (May 31, 2018)</xs:documentation>
   </xs:annotation>
diff --git a/bsyncviewer/lib/validator/examples/schema1.0.0/Example – Valid Schema Invalid UseCase.xml b/bsyncviewer/lib/validator/examples/schema1.0.0/Example – Valid Schema Invalid UseCase.xml
@@ -1,4 +1,4 @@
-<auc:Audits xmlns:auc="http://nrel.gov/schemas/bedes-auc/2014">
+<auc:Audits xmlns:auc="http://nlr.gov/schemas/bedes-auc/2014">
   <auc:Audit ID="Audit-70234559076380">
     <auc:Sites>
       <auc:Site ID="Site-70234398332900">
diff --git a/bsyncviewer/lib/validator/examples/schema2.2.0/L200_Audit.xml b/bsyncviewer/lib/validator/examples/schema2.2.0/L200_Audit.xml
@@ -4,7 +4,7 @@
   This file is intended to document all of the required elements and attributes
   for a Level 2 audit.
 -->
-<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 /Users/tedsummer/Development/Projects/NREL/schema/BuildingSync.xsd" version="2.2.0">
+<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 /Users/tedsummer/Development/Projects/NLR/schema/BuildingSync.xsd" version="2.2.0">
   <auc:Facilities>
     <auc:Facility ID="Facility-A">
       <auc:Sites>
diff --git a/bsyncviewer/templates/base.html b/bsyncviewer/templates/base.html
@@ -110,7 +110,7 @@ <h1>{% block title %}(no title){% endblock %}</h1>
       <div>
         <ul class="copyright">
           <p>BuildingSync<sup>®</sup> is a registered trademark of the Alliance for Energy Innovation, LLC.</p>
-          <p>The <a href="https://www.nrel.gov/" target="_blank" rel="noopener">National Laboratory of the Rockies</a> is a national laboratory of the U.S. Department of Energy, Office of Critical Minerals and Energy Innovation.</p>
+          <p>The <a href="https://www.nlr.gov/" target="_blank" rel="noopener">National Laboratory of the Rockies</a> is a national laboratory of the U.S. Department of Energy, Office of Critical Minerals and Energy Innovation.</p>
         </ul>
       </div>
     </footer>
diff --git a/bsyncviewer/templates/base2.html b/bsyncviewer/templates/base2.html
@@ -132,7 +132,7 @@ <h1>{% block title %}(no title){% endblock title %}</h1>
         <div class="col-sm-9">
           <div class="item-about">
             <p>BuildingSync® is a registered trademark of the Alliance for Energy Innovation, LLC.</p>
-            <p>The <a href="https://www.nrel.gov/" target="_blank" rel="noopener">National Laboratory of the Rockies</a> is a national laboratory of the U.S. Department of Energy, Office of Critical Minerals and Energy Innovation.</p>
+            <p>The <a href="https://www.nlr.gov/" target="_blank" rel="noopener">National Laboratory of the Rockies</a> is a national laboratory of the U.S. Department of Energy, Office of Critical Minerals and Energy Innovation.</p>
             <!-- 	<div class="social-icon">
                     <span><i class="fa fa-facebook" aria-hidden="true"></i></span>
                     <span><i class="fa fa-twitter" aria-hidden="true"></i></span>
diff --git a/bsyncviewer/templates/index.html b/bsyncviewer/templates/index.html
@@ -383,7 +383,7 @@ <h5><a href="https://lists.buildingenergytools.org/g/BuildingSync" target="_blan
               </div>
               <div class="info-content">
                 <h6>Department of Energy</h6>
-                <h5><a href="https://www.energy.gov/eere/buildings/buildingsync" target="_blank" rel="noopener">BuildingSync Project Details</a></h5>
+                <h5><a href="https://www.energy.gov/cmei/buildings/buildingsync" target="_blank" rel="noopener">BuildingSync Project Details</a></h5>
               </div>
             </div>
           </div>
diff --git a/bsyncviewer/tests/data/test_schema.xsd b/bsyncviewer/tests/data/test_schema.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 (x64) (http://www.altova.com) by kflemin (NREL) -->
+<!-- edited with XMLSpy v2016 (x64) (http://www.altova.com) by kflemin (NLR) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" targetNamespace="http://buildingsync.net/schemas/bedes-auc/2019" elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:annotation>
 		<xs:documentation>BuildingSync Schema - Version 1.0 (January 31, 2019)</xs:documentation>
diff --git a/bsyncviewer/tests/data/test_valid_schema.xml b/bsyncviewer/tests/data/test_valid_schema.xml
@@ -1,4 +1,4 @@
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Dan Macumber (NREL) -->
+<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Dan Macumber (NLR) -->
 <auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://raw.githubusercontent.com/BuildingSync/schema/v1.0-patch/BuildingSync.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <auc:Facilities>
     <auc:Facility>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<auc:Audits xmlns:auc="http://nrel.gov/schemas/bedes-auc/2014">`
	`1`	`+<auc:Audits xmlns:auc="http://nlr.gov/schemas/bedes-auc/2014">`
`2`	`2`	`<auc:Audit ID="Audit-70234559076380">`
`3`	`3`	`<auc:Sites>`
`4`	`4`	`<auc:Site ID="Site-70234398332900">`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Dan Macumber (NREL) -->`
	`1`	`+<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Dan Macumber (NLR) -->`
`2`	`2`	`<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://raw.githubusercontent.com/BuildingSync/schema/v1.0-patch/BuildingSync.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">`
`3`	`3`	`<auc:Facilities>`
`4`	`4`	`<auc:Facility>`