Merge branch 'main' into display

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ default_language_version:
 repos:
 
   - repo: "https://github.com/pre-commit/pre-commit-hooks"
-    rev: "v4.4.0"
+    rev: "v4.6.0"
     hooks:
       - id: "check-added-large-files"
       - id: "check-case-conflict"
@@ -30,24 +30,24 @@ repos:
       - id: "trailing-whitespace"
 
   - repo: "https://github.com/astral-sh/ruff-pre-commit"
-    rev: "v0.1.7"
+    rev: "v0.6.3"
     hooks:
       - id: "ruff"
         # NOTE: "--exit-non-zero-on-fix" is important for CI to function
         # correctly!
         args: ["--fix", "--exit-non-zero-on-fix"]
 
   - repo: "https://github.com/psf/black"
-    rev: "23.3.0"
+    rev: "24.8.0"
     hooks:
       - id: "black"
 
   # Format and validate CFF. NOTE: pre-commit doesn't recognize CFF as YAML
   # (https://github.com/pre-commit/identify/pull/435), so we may need to
   # specify the prettier hook twice if we want to format other things and avoid
   # a messy regex.
-  - repo: "https://github.com/pre-commit/mirrors-prettier"
-    rev: "v3.1.0"
+  - repo: "https://github.com/rbubley/mirrors-prettier"
+    rev: "v3.3.3"
     hooks:
       - id: "prettier"
         files: "CITATION.cff"
@@ -59,7 +59,7 @@ repos:
           - "--verbose"
 
   - repo: "https://github.com/codespell-project/codespell"
-    rev: "v2.2.4"
+    rev: "v2.3.0"
     hooks:
       - id: "codespell"
         exclude: ".codespellignore"

CHANGELOG.md

@@ -1,3 +1,23 @@
+## v2.3.0 (2024-10-02)
+
+* Allow null link raings (db migration ea1181510e10)
+
+## v2.2.0 (2024-10-01)
+
+* Allow nodes of same type to link.
+* Reverse color bar.
+* Add new link fields (db migration 925ed377e31b).
+
+## v2.1.0 (2024-09-26)
+
+* Increase length of description columns to 4096 chars (db migration fafa3da67d5e).
+
+
+## v2.0.2 (2024-06-07)
+
+* Change all sankey nodes to gray color.
+
+
 ## v2.0.1 (2024-03-21)
 
 * Bugfix: Remove obsolete template import.
@@ -167,7 +187,7 @@
 ## v0.3.0 (2023-08-17)
 
 * Set up/improve all relationship interfaces
-* Populate societal benfit area reference data
+* Populate societal benefit area reference data
 * Implement role dropdown on profile page
 
 ## v0.2.1 (2023-08-10)

CITATION.cff

@@ -10,8 +10,8 @@ type: "software"
 #    https://github.com/zenodo/zenodo/issues/2515
 license: "MIT"
 
-version: 2.0.1
-date-released: "2024-03-21"
+version: 2.3.0
+date-released: "2024-10-02"
 url: "https://github.com/nsidc/usaon-benefit-tool"
 
 authors:

CODE_OF_CONDUCT.md

@@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
+level of experience, education, socioeconomic status, nationality, personal
 appearance, race, religion, or sexual identity and orientation.
 
 

Dockerfile

@@ -19,10 +19,12 @@ RUN micromamba install -y \
 
 
 # Install source
+COPY ./usaon_benefit_tool ./usaon_benefit_tool
 COPY ./pyproject.toml .
 COPY ./tasks ./tasks
 COPY ./scripts ./scripts
-COPY ./usaon_benefit_tool ./usaon_benefit_tool
+COPY ./migrations ./migrations
+COPY ./alembic.ini .
 
 ENV FLASK_APP=usaon_benefit_tool
 

VERSION.env

@@ -1 +1 @@
-export USAON_BENEFIT_TOOL_VERSION="v2.0.1"
+export USAON_BENEFIT_TOOL_VERSION="v2.3.0"

alembic.ini

@@ -0,0 +1,118 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
+script_location = migrations
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to migrations/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+# version_path_separator = newline
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# IMPORTANT: Populated in env.py dynamically
+sqlalchemy.url = fakeurl
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = %(here)s/.venv/bin/ruff
+# ruff.options = --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

compose.dev.yml

@@ -31,6 +31,7 @@ services:
     user: "root"
     volumes:
       - "./usaon_benefit_tool:/usaon-benefit-tool/usaon_benefit_tool:ro"
+      - "./migrations:/usaon-benefit-tool/migrations:rw"
       - "./tasks:/usaon-benefit-tool/tasks:ro"
     ports:
       - "5000:5000"