Update to released Lattice version.

IBPSA-USA · Jan 17, 2023 · 476096f · 476096f
1 parent f4eb76e
commit 476096f
Show file tree

Hide file tree

Showing 6 changed files with 239 additions and 175 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -8,32 +8,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9"]
+        os: [ubuntu-latest]
+        python-version: ["3.10"]
     defaults:
       run:
         shell: bash
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/checkout@v3
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: bigladder/github-actions/setup-python-poetry@main
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        uses: snok/install-poetry@v1.3.1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-      - name: Install dependencies
-        run: poetry install
+      - name: Setup Hugo
+        uses: bigladder/lattice/.github/actions/setup-hugo@main
       - name: Build and test
         run: |
           source $VENV
           poetry run doit
-      - name: Upload Build Content
-        uses: actions/upload-artifact@v2
-        with:
-          name: build-content-${{ matrix.os }}-py${{ matrix.python-version }}
-          path: .lattice
diff --git a/.github/workflows/build-web.yaml b/.github/workflows/build-web.yaml
@@ -12,37 +12,20 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.9"]
+        python-version: ["3.10"]
     defaults:
       run:
         shell: bash
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2
-        with:
-          hugo-version: '0.104.3'
-          extended: true
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-      - name: Setup python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: bigladder/github-actions/setup-python-poetry@main
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        uses: snok/install-poetry@v1.3.1
-        with:
-          version: 1.2.0
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-      - name: Install dependencies
-        run: poetry install
-      - name: Install Pandoc
-        run: sudo apt install pandoc
+      - name: Setup Hugo
+        uses: bigladder/lattice/.github/actions/setup-hugo@main
       - name: Build web
         run: |
           source $VENV

diff --git a/dodo.py b/dodo.py
@@ -9,9 +9,6 @@
 
 climate_data_model = Lattice()
 
-DOIT_CONFIG = {"default_tasks": ["validate_example_files"]}
-
-
 def task_validate_example_files():
   '''Validates the example files against the JSON schema (and other validation steps)'''
   return {