Merge branch 'main' into renovate/actions-checkout-4.x

HHS · Sep 26, 2023 · 52c3aaa · 52c3aaa
2 parents 986443f + 0d20fad
commit 52c3aaa
Show file tree

Hide file tree

Showing 247 changed files with 3,361 additions and 1,807 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # OPRE OPS
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 
 This is the OPRE's Research Portfolio Management System, or OPS. The finished product will replace OPRE's prior system,
 [MAPS](https://github.com/HHS/MAPS-app). The purpose of OPS can be found on

diff --git a/backend/data_tools/Pipfile b/backend/data_tools/Pipfile
@@ -5,12 +5,12 @@ name = "pypi"
 
 [packages]
 SQLAlchemy = "==2.0.21"
-pandas = "==1.5.3"
+pandas = "==2.1.1"
 json5 = "==0.9.14"
 psycopg2-binary = "==2.9.7"
 cfenv = "==0.5.3"
 sqlalchemy-mixins = "==1.5.3"
-typing-extensions = "==4.7.1"
+typing-extensions = "==4.8.0"
 desert = "2022.9.22"
 sqlalchemy-continuum = "==1.4.0"
 

diff --git a/backend/data_tools/Pipfile.lock b/backend/data_tools/Pipfile.lock
diff --git a/backend/data_tools/data/agreements_and_blin_data.json5 b/backend/data_tools/data/agreements_and_blin_data.json5
@@ -235,7 +235,7 @@
       amount: 1000000.0,
       status: "DRAFT",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0,
     },
     {
       line_description: "LI 2",
@@ -245,7 +245,7 @@
       amount: 1000000.0,
       status: "DRAFT",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0,
     },
     {
       line_description: "Line Item 1",
@@ -255,7 +255,7 @@
       amount: 1000000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -265,7 +265,7 @@
       amount: 1000000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 1",
@@ -275,7 +275,7 @@
       amount: 1000000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -285,7 +285,7 @@
       amount: 1000000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 1",
@@ -295,7 +295,7 @@
       amount: 1000000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -305,7 +305,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -315,7 +315,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -326,7 +326,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -336,7 +336,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -346,7 +346,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -356,7 +356,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -366,7 +366,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -376,7 +376,7 @@
       amount: 2000000.0,
       status: "IN_EXECUTION",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -386,7 +386,7 @@
       amount: 1000000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -396,7 +396,7 @@
       amount: 3000000.0,
       status: "OBLIGATED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Line Item 2",
@@ -406,7 +406,7 @@
       amount: 7000000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "Yet Another Line Item",
@@ -416,17 +416,17 @@
       amount: 500.0,
       status: "OBLIGATED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 4.8,
+      proc_shop_fee_percentage: 0.048,
     },
     {
-      line_description: "Yet Another Line Item",
+    line_description: "Yet Another Line Item",
       comments: "",
       can_id: 15,
       agreement_id: 8,
       amount: 500.0,
       status: "OBLIGATED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 4.8,
+      proc_shop_fee_percentage: 0.048,
     },
     {
       line_description: "SC2",
@@ -436,7 +436,7 @@
       amount: 700000.0,
       status: "PLANNED",
       date_needed: "2043-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
     {
       line_description: "SC3",
@@ -446,7 +446,7 @@
       amount: 300000.0,
       status: "PLANNED",
       date_needed: "2044-06-13T14:03:25.765487",
-      psc_fee_amount: 0.5,
+      proc_shop_fee_percentage: 0.005,
     },
   ],
   agreement_team_members: [