Merge branch 'develop' into 4789-import-labels

Author: perryr16

.cspell.json

@@ -98,6 +98,7 @@
     "datestrings",
     "datetime",
     "dateutil",
+    "dbressan",
     "dedeploy",
     "defaultdb",
     "defaultdict",
@@ -131,6 +132,7 @@
     "filename",
     "filepath",
     "filesystem",
+    "filterset",
     "fineuploader",
     "firefox",
     "Firefox",
@@ -164,6 +166,7 @@
     "href",
     "html",
     "iand",
+    "icontains",
     "idx",
     "importfile",
     "ImportFile",

.github/workflows/ci.yml

@@ -111,7 +111,7 @@ jobs:
       - name: Install deps
         run: |
           pip install --upgrade pip
-          pip install tox==3.14.3
+          pip install tox==4.20.0
           sudo apt update
           sudo apt install gdal-bin
       - name: Setup config

.pre-commit-config.yaml

@@ -5,18 +5,18 @@ repos:
       - id: check-added-large-files
         args: ["--maxkb=2000"]
       - id: check-ast
+      - id: check-builtin-literals
       - id: check-case-conflict
       - id: check-json
       - id: check-merge-conflict
+      - id: check-toml
       - id: check-xml
       - id: check-yaml
-        exclude: .*/templates
       - id: debug-statements
       - id: end-of-file-fixer
         exclude: seed/static/seed/locales/
       - id: fix-byte-order-marker
       - id: mixed-line-ending
-        exclude: seed/static/seed/locales/
       - id: pretty-format-json
         args: ["--autofix", "--no-sort-keys", "--no-ensure-ascii"]
         exclude: seed/static/seed/locales/
@@ -29,7 +29,7 @@ repos:
         types_or: [yaml, markdown, css, scss]
   # https://docs.astral.sh/ruff/integrations/#pre-commit
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.1
+    rev: v0.8.3
     hooks:
       # Run the linter
       - id: ruff

CHANGELOG.md

@@ -1,3 +1,34 @@
+# SEED Version 3.2.2
+
+<!-- Release notes generated using configuration in .github/release.yml at 3.2.2-release-prep -->
+
+## What's Changed
+### New Features 🎉
+* Add button to show or hide all labels by @perryr16 in https://github.com/SEED-platform/seed/pull/4875
+* Add transactions template to portfolio summary by @perryr16 in https://github.com/SEED-platform/seed/pull/4891
+* Add building groups functionality by @haneslinger in https://github.com/SEED-platform/seed/pull/4899
+### Improvements 📈
+* Add derived columns to program setup by @haneslinger in https://github.com/SEED-platform/seed/pull/4888
+* Fix Default Reports and Analyses by @kflemin in https://github.com/SEED-platform/seed/pull/4887
+* Portfolio summary move to backend by @perryr16 in https://github.com/SEED-platform/seed/pull/4885
+* Speed up program and property insight pages by @haneslinger in https://github.com/SEED-platform/seed/pull/4890
+* Add show all labels description text and translation by @kflemin in https://github.com/SEED-platform/seed/pull/4896
+* Update list of possible Audit Template reports in org settings by @kflemin in https://github.com/SEED-platform/seed/pull/4903
+### Maintenance 🧹
+* Remove obsolete scope 1 emission codes by @anchapin in https://github.com/SEED-platform/seed/pull/4897
+* Major dependency update by @axelstudios in https://github.com/SEED-platform/seed/pull/4806
+### Bug Fixes 🐛
+* Display current access level instance names in default reports by @kflemin in https://github.com/SEED-platform/seed/pull/4882
+* Include derived columns in y axis for default reports by @kflemin in https://github.com/SEED-platform/seed/pull/4883
+* Change CTS export column name by @haneslinger in https://github.com/SEED-platform/seed/pull/4884
+* Fix invalid permission class by @axelstudios in https://github.com/SEED-platform/seed/pull/4894
+* Fix notes modal by @haneslinger in https://github.com/SEED-platform/seed/pull/4874
+* Fix organization deletion by @crutan in https://github.com/SEED-platform/seed/pull/4851
+* Mapping review and line length bug fixes by @axelstudios in https://github.com/SEED-platform/seed/pull/4906
+
+
+**Full Changelog**: https://github.com/SEED-platform/seed/compare/v3.2.1...v3.2.2
+
 # SEED Version 3.2.1
 
 <!-- Release notes generated using configuration in .github/release.yml at 3.2.1-release-prep -->

config/settings/common.py

@@ -223,6 +223,7 @@
 CELERY_RESULT_EXPIRES = 86400  # 24 hours
 CELERY_TASK_COMPRESSION = "gzip"
 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
+CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True
 
 # hmm, we are logging outside the context of the app?
 LOG_FILE = os.path.join(BASE_DIR, "../logs/py.log/")

config/settings/docker.py

@@ -51,7 +51,7 @@ def env_var(key, default=None):
 
 for loc in ENV_VARS:
     if not locals().get(loc):
-        raise Exception("%s Not defined as env variables" % loc)
+        raise Exception(f"{loc} Not defined as env variables")
 
 
 DEBUG = env_var("Debug", False)