Development

.bumpversion.cfg

@@ -1,9 +1,9 @@
 [bumpversion]
-current_version = 0.8.17
+current_version = 0.9.0
 commit = True
 tag = True
 
-[bumpversion:file:my_project/layout.py]
+[bumpversion:file:pages/lib/layout.py]
 search = Version: {current_version}
 replace = Version: {new_version}
 

.dockerignore

@@ -2,16 +2,24 @@ README.md
 LICENSE
 Procfile
 Procfile.windows
+Pipfile.lock
+Pipfile
 *.pyo
 *.pyd
 __pycache__
 .pytest_cache
 file_system_store
 .git
+.gitbook
+.gitbook.yaml
 docs
-test
+tests
+node_modules
+.my_cache
 
 assets/data/Region*.kml
+assets/data/OneBuilding*.zip
+file_system_backend
 
 venv
 .idea
@@ -162,20 +170,14 @@ typings/
 .serverless
 ### Python template
 # Byte-compiled / optimized / DLL files
-__pycache__/
-*/__pycache__/*
-*.pyc
-*.py[cod]
 *$py.class
 
 # C extensions
 *.so
 
 # Distribution / packaging
 .Python
-build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/

.gcloudignore

@@ -7,13 +7,16 @@
 
 README.md
 LICENSE
-Procfile
-Procfile.windows
 *.pyo
 *.pyd
 __pycache__
 .pytest_cache
+.gitbook
+docs
+file_system_backend
+tests
+.gitbook.yaml
+assets/data/OneBuilding*.zip
 
 assets/data/Region*.kml
-file_system_store
-test
+file_system_store

.github/workflows/cypress.yml

@@ -1,5 +1,11 @@
-name: Cypress 🌲 
-on: [push, pull_request]
+name: Cypress Testing 🌲
+on:
+  push:
+    branches:
+      - development
+  pull_request:
+    branches:
+      - development
 jobs:
   cypress:
     runs-on: ubuntu-latest
@@ -10,7 +16,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Build Clima
         run: |-
@@ -37,14 +43,14 @@ jobs:
           npm run cy:run
 
       - name: Archive screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: cypress-screenshots
           path: tests/node/cypress/screenshots
 
       - name: Archive videos
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: cypress-videos

.github/workflows/deploy.yml

@@ -1,46 +1,31 @@
 # .github/workflows/deploy.yml
 name: Deploy 🚀 Clima to Google Cloud Run (☁🏃)
+
 on:
   push:
     branches:
       - main
+
 jobs:
   deploy:
     name: Deploying 🚀 Clima
     runs-on: ubuntu-latest
-    if: "contains(github.event.head_commit.message, 'bump version')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Setup python
-        uses: actions/setup-python@v4
+      - id: auth
+        uses: google-github-actions/auth@v2
         with:
-          python-version: '3.11'
-
-      - name: Export gcloud related env variable
-        run: export CLOUDSDK_PYTHON="/usr/bin/python3"
+          credentials_json: ${{ secrets.GCP_SA_KEY_JSON }}
 
-      # Build and push image to Google Container Registry
-      - name: Setting up
-        uses: google-github-actions/setup-gcloud@v0
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v1
         with:
-          version: '318.0.0'
-          service_account_key: ${{ secrets.GCP_SA_KEY_JSON }}
-          service_account_email: "federico.tartarini@bears-berkeley.sg"
-          project_id: clima-316917
+          project_id: heat-stress-scale
 
-      - name: Building (🏗️)
-        run: |-
+      - name: Building (🏗️) and Deploying (🚀)
+        run: |
           gcloud builds submit \
-            --tag us-docker.pkg.dev/clima-316917/gcr.io/clima
-
-      # Setup gcloud CLI
-      - name: Deploy (🚀)
-        uses: google-github-actions/deploy-cloudrun@v1
-        with:
-          service: clima
-          image: us-docker.pkg.dev/clima-316917/gcr.io/clima
-          region: us-central1
-          credentials: ${{ secrets.GCP_SA_KEY_JSON }}
-          project_id: clima-316917
+            --project=clima-316917 \
+            --substitutions=_REPO_NAME="clima",_PROJ_NAME="clima-316917",_IMG_NAME="main",_GCR="us.gcr.io",_REGION="us-central1",_MEMORY="4Gi",_CPU="2"

.github/workflows/python.yml

@@ -1,5 +1,11 @@
-name: Python 🐍 
-on: [push, pull_request]
+name: Python Testing 🐍
+on:
+  push:
+    branches:
+      - development
+  pull_request:
+    branches:
+      - development
 jobs:
   pytest:
     runs-on: ubuntu-latest
@@ -17,13 +23,14 @@ jobs:
           pip install pipenv
           pipenv install --dev
 
-      - name: Test Clima
+      - name: Ruff Check
         run: |-
-          pipenv run python -m pytest
+          pipenv run ruff check . --output-format=github
+
+      - name: Ruff Format (verify)
+        run: |-
+          pipenv run ruff format --check .
 
-      - name: Run Black
-        # TODO: Add to dev dependencies: Adding it right now
-        # bumps other dependencies and the application won't run.
+      - name: Test Clima
         run: |-
-          pip install black
-          black . --check
+          pipenv run python -m pytest

.gitignore

@@ -220,9 +220,6 @@ target/
 # Jupyter Notebook
 .ipynb_checkpoints
 
-# pyenv
-.python-version
-
 # celery beat schedule file
 celerybeat-schedule
 
@@ -279,4 +276,6 @@ bh_unicode_properties.cache
 
 # Sublime-github package stores a github token in this file
 # https://packagecontrol.io/packages/sublime-github
-GitHub.sublime-settings
+GitHub.sublime-settings
+
+file_system_backend

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+repos:
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.12.9
+  hooks:
+    # Run the linter.
+    - id: ruff-check
+      args: [ --fix ]
+    # Run the formatter.
+    - id: ruff-format

.python-version

@@ -0,0 +1 @@
+3.10

Pipfile

@@ -4,23 +4,26 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-dash = "==2.14.2"
+dash = "==2.15"
 pvlib = "==0.9.1"
-pythermalcomfort = "*"
+pythermalcomfort = "==2.9.1"
 dash-bootstrap-components = "==1.2.0"
 dash-extensions = "==1.0.7"
-dash-mantine-components = "*"
-requests = "*"
-plotly = "*"
-pandas = "*"
-numpy = "*"
+dash-mantine-components = "==0.12.1"
+requests = "==2.32.4"
+plotly = "==5.18.0"
+pandas = "==2.2.0"
+numpy = "==1.26.3"
+dash-iconify = "*"
+scipy = "==1.12.0"
 
 [dev-packages]
 cleanpy = "*"
 pytest = "*"
 bump2version = "*"
-pandas = "*"
-requests = "*"
+black = "*"
+ruff = "*"
+pre-commit = "*"
 
 [requires]
 python_version = "3.11"