NREL
diff --git a/‎.github/workflows/cd.yml‎
Lines changed: 14 additions & 7 deletions b/‎.github/workflows/cd.yml‎
Lines changed: 14 additions & 7 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 87 additions & 9 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 87 additions & 9 deletions
diff --git a/‎.pre-commit-config.yaml‎
Lines changed: 4 additions & 4 deletions b/‎.pre-commit-config.yaml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎.readthedocs.yaml‎
Lines changed: 12 additions & 17 deletions b/‎.readthedocs.yaml‎
Lines changed: 12 additions & 17 deletions
diff --git a/‎buildingmotif-app/Dockerfile‎
Lines changed: 1 addition & 1 deletion b/‎buildingmotif-app/Dockerfile‎
Lines changed: 1 addition & 1 deletion
@@ -1,6 +1,6 @@
 name: continuous deployment
 
-on: 
+on:
   pull_request:
     branches:
     - develop
@@ -19,11 +19,13 @@ jobs:
     steps:
       # setup, checkout pull_request.head.ref for repo-vis
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
       - name: setup-python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
       # # update repo visualization for docs
       # - name: repo-visualizer
       #   uses: githubocto/[email protected]
@@ -32,8 +34,13 @@ jobs:
       #     excluded_paths: ".github"
       #     commit_message: "repo-visualizer [skip actions]"
       # install project, which is required for autodoc of code
+      - name: install-poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.4.0
+          virtualenvs-create: false
       - name: install buildingmotif
-        run: pip install .
+        run: poetry install --all-extras
       # install jupyter-book, which for some reason isn't available with poetry install
       - name: install jupyter book
         run: pip install jupyter-book
@@ -47,7 +54,7 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs/_build/html      
+          publish_dir: ./docs/_build/html
 
   # deploy distribution if a new release and tag are created
   deploy-dist:
@@ -57,9 +64,9 @@ jobs:
     steps:
       # setup
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup-python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
       # install poetry and build dist
       - name: install-poetry
         uses: snok/install-poetry@v1
 
@@ -1,17 +1,26 @@
 name: continuous integration
 
 on:
-  push
+  push:
+  pull_request_review:
+    types: [submitted]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
 
   styling:
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup-python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
       - name: install-poetry
         uses: snok/install-poetry@v1
         with:
@@ -25,17 +34,24 @@ jobs:
           poetry run isort . --check
           poetry run black . --check
 
+  # The "testing" job verifies the base SDK functionality across
+  # all supported Python versions.
   testing:
+    if: github.event_name == 'push'
     needs: styling
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4 # for topquadrant shacl support
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: setup-python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: install-poetry
@@ -49,9 +65,42 @@ jobs:
       - name: lint
         run: poetry run flake8 buildingmotif
       - name: type check
-        run: poetry run mypy
+        run: poetry run mypy --ignore-missing-imports
       - name: unit tests
         run: poetry run pytest tests/unit --cov=./ --cov-report=xml
+      - name: build tests
+        run: poetry build
+
+  # We only run "integration" tests on the latest Python version.
+  # These tests detect if changes to ontologies, libraries, models and BuildingMOTIF
+  # affect correct operation of notebooks and BACnet scans. Library integration testing
+  # is a separate job
+  integration:
+    if: github.event_name == 'push'
+    needs: styling
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.11']
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4 # for topquadrant shacl support
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: setup-python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: install-poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.4.0
+          virtualenvs-in-project: false
+          virtualenvs-path: ~/.virtualenvs
+      - name: poetry install
+        run: poetry install --all-extras
       - name: integration tests
         run: poetry run pytest tests/integration
       - name: bacnet tests
@@ -61,8 +110,37 @@ jobs:
           docker compose run -d device
           docker compose run buildingmotif poetry run pytest -m bacnet
           docker compose down
-      - name: build tests
-        run: poetry build
+
+  # We only run "library" tests on the latest Python version.
+  # These tests detect if changes to ontologies, libraries, models and BuildingMOTIF
+  # affect correct operation of templates, shapes, and validation
+  libraries:
+    if: github.event.review.state == 'approved' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.11']
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4 # for topquadrant shacl support
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: setup-python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: install-poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.4.0
+          virtualenvs-in-project: false
+          virtualenvs-path: ~/.virtualenvs
+      - name: poetry install
+        run: poetry install --all-extras
+      - name: library tests
+        run: poetry run pytest tests/library
 
   coverage:
     needs: testing
 
@@ -16,9 +16,9 @@ repos:
         entry: poetry run flake8 buildingmotif
 # can't poetry run becuase not present in repository https://github.com/pre-commit/mirrors-mypy
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.931
+    rev: v1.10.0
     hooks:
     -   id: mypy
-        args: ["--install-types", "--non-interactive", "--ignore-missing-imports"]
-        additional_dependencies: [sqlalchemy2-stubs <= 0.0.2a20, SQLAlchemy <= 1.4]
-exclude: docs/conf.py
+        args: ["--install-types", "--non-interactive", "--ignore-missing-imports", "--follow-imports=skip", "--disable-error-code=import-untyped"]
+        additional_dependencies: [sqlalchemy2-stubs <= 0.0.2a38, SQLAlchemy < 1.5]
+exclude: docs/conf.py
@@ -1,34 +1,29 @@
-# .readthedocs.yaml
-# Read the Docs configuration file
+# Read the Docs configuration file for Sphinx projects
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
 # Required
 version: 2
 
-# Set the version of Python and other tools you might need
+# Set the OS, Python version and other tools you might need
 build:
   os: ubuntu-22.04
   tools:
     python: "3.10"
-    # You can also specify other tool versions:
-    # nodejs: "19"
-    # rust: "1.64"
-    # golang: "1.19"
   jobs:
     pre_build:
       # Generate the Sphinx configuration for this Jupyter Book so it builds.
-      - "pip install -U jupyter-book"
+      - "pip install jupyter-book"
       - "jupyter-book config sphinx docs/"
 
-# Build documentation in the docs/ directory with Sphinx
+# Build documentation in the "docs/" directory with Sphinx
 sphinx:
    configuration: docs/conf.py
+   fail_on_warning: false
 
-# If using Sphinx, optionally build your docs in additional formats such as PDF
-# formats:
-#    - pdf
-
-# Optionally declare the Python requirements required to build your docs
-# python:
-#    install:
-#    - requirements: docs/requirements.txt
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+   install:
+    - method: pip
+      path: .
@@ -1,4 +1,4 @@
-FROM node:18.10.0
+FROM node:18.19.0
 
 WORKDIR /buildingmotif-app
 COPY . .
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:18.10.0`
	`1`	`+FROM node:18.19.0`
`2`	`2`
`3`	`3`	`WORKDIR /buildingmotif-app`
`4`	`4`	`COPY . .`