Merge branch 'eslint-spacing' into commuter-rail-prep

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         node-version: ['18', '20']
-        python-version: ['3.10']
+        python-version: ['3.11']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         node-version: ['18']
-        python-version: ['3.10']
+        python-version: ['3.11']
     env:
       AWS_PROFILE: transitmatters
       AWS_DEFAULT_REGION: us-east-1

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         node-version: ['18']
-        python-version: ['3.10']
+        python-version: ['3.11']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         node-version: ['18']
-        python-version: ['3.10']
+        python-version: ['3.11']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3

.python-version

@@ -1 +1 @@
-3.10.11
+3.11.6

README.md

@@ -12,7 +12,7 @@ This is the repository for the TransitMatters Data Dashboard. Client code is wri
 - node 18.x and npm 9.x required
   - With `nvm` installed, use `nvm install && nvm use`
   - verify with `node -v`
-- Python 3.10 with recent poetry (1.5.0 or later)
+- Python 3.11 with recent poetry (1.6.0 or later)
   - Verify with `python --version && poetry --version`
   - `poetry self update` to update poetry
 

modules/service/utils/utils.ts

@@ -8,10 +8,11 @@ export const getServiceWidgetValues = (
 ) => {
   const totals = deliveredTripMetrics.reduce(
     (totals, datapoint, index) => {
-      if (datapoint.count && predictedData.counts[index].count) {
+      const predictedDatapoint = predictedData.counts[index];
+      if (datapoint.count && predictedDatapoint?.count) {
         return {
           actual: totals.actual + datapoint.count,
-          scheduled: totals.scheduled + predictedData.counts[index].count,
+          scheduled: totals.scheduled + predictedDatapoint.count,
         };
       }
       return { actual: totals.actual, scheduled: totals.scheduled };

server/cloudformation.json

@@ -109,7 +109,13 @@
         "WebsiteConfiguration": {
           "IndexDocument": "index.html",
           "ErrorDocument": "404.html"
-        }
+        },
+        "Tags": [
+          {
+            "Key": "service",
+            "Value": "t-performance-dash"
+          }
+        ]
       }
     },
     "FrontendBucketPolicy": {

server/pyproject.toml

@@ -6,28 +6,29 @@ authors = ["TransitMatters Labs Team"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "~3.10"
+python = "~3.11"
 json-api-doc = "0.15.0"
 requests = "2.31.0"
 pytz = "2023.3"
-boto3 = "1.26.153"
-botocore = "1.29.153"
-numpy = "1.24.3"
+boto3 = "1.34.2"
+botocore = "1.34.2"
+numpy = "1.26.2"
 pandas = "1.5.3"
-datadog_lambda = "4.75.0"
-ddtrace = "1.15.0"
+datadog_lambda = "5.85.0"
+ddtrace = "2.3.1"
 dynamodb-json = "^1.3"
 
 [tool.poetry.dev-dependencies]
 pip = ">=23.0"
-chalice = "1.29.0"
-flake8 = "~6.0.0"
-black = "~23.7.0"
+chalice = "1.30.0"
+flake8 = "~6.1.0"
+black = "~23.12.0"
+poetry-plugin-export = "^1.6.0"
 
 [tool.black]
 line-length = 120
-target-version = ['py310']
+target-version = ['py311']
 
 [build-system]
-requires = ["poetry-core>=1.5.0"]
+requires = ["poetry-core>=1.6.0"]
 build-backend = "poetry.core.masonry.api"