Code

Resolve merge conflicts in #1776#1780

Code

Closed

claire-simpson wants to merge 14 commits intonatcap:release/3.15.0natcap/invest:release/3.15.0from claire-simpson:pr-resolutionclaire-simpson/invest:pr-resolutionCopy head branch name to clipboard

+871-3

Commits

Commits on Jan 29, 2025

• Add unittests for AWY

  claire-simpson

  committed
  3f8a172

  Copy full SHA for 3f8a172

• updated AWY tests

  claire-simpson

  committed
  2ebeb7c

  Copy full SHA for 2ebeb7c

• Added unittests for carbon

  claire-simpson

  committed
  20cf2c4

  Copy full SHA for 20cf2c4

• Merge branch 'main' into 1603-unit-tests

  Show description for d42cd14
  claire-simpson

  committed
  d42cd14

  Copy full SHA for d42cd14

Commits on Jan 30, 2025

• coastal blue carbon tests added

  claire-simpson

  committed
  e511957

  Copy full SHA for e511957

Commits on Jan 31, 2025

• Add coastal vulnerability unit tests

  claire-simpson

  committed
  83279d6

  Copy full SHA for 83279d6

• Merge branch 'main' into 1603-unit-tests

  Show description for fa954b9
  claire-simpson

  committed
  fa954b9

  Copy full SHA for fa954b9

Commits on Feb 6, 2025

• add unit tests to crop production (regression)

  claire-simpson

  committed
  570ecbf

  Copy full SHA for 570ecbf

• fixed formatting

  claire-simpson

  committed
  242ed8c

  Copy full SHA for 242ed8c

• resolve merge conflicts

  claire-simpson

  committed
  068f37c

  Copy full SHA for 068f37c

• reorganization, linting, cleanup

  claire-simpson

  committed
  7e0eb0d

  Copy full SHA for 7e0eb0d

• fixed workspace

  claire-simpson

  committed
  952ef9f

  Copy full SHA for 952ef9f

Commits on Feb 7, 2025

• Merge pull request natcap#1776 from claire-simpson/1603-unit-tests

  Show description for 347c7a0
  emlys

  authored
  347c7a0

  Copy full SHA for 347c7a0

Commits on Feb 8, 2025

• Merge branch 'main' into pr-resolution

  Show description for 8488de3
  claire-simpson

  committed
  8488de3

  Copy full SHA for 8488de3