Skip to content

Commit

Permalink
Merge branch 'main' into OPS-2781/adding-remaining-cans-endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
rajohnson90 authored Sep 23, 2024
2 parents 405e5c7 + 26e518c commit d08f92b
Show file tree
Hide file tree
Showing 8 changed files with 255 additions and 214 deletions.
44 changes: 29 additions & 15 deletions .github/actions/bump-and-tag/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/data_tools/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "pypi"

[packages]
SQLAlchemy = "==2.0.35"
pandas = "==2.2.2"
pandas = "==2.2.3"
json5 = "==0.9.25"
psycopg2-binary = "==2.9.9"
cfenv = "==0.5.3"
Expand Down
244 changes: 132 additions & 112 deletions backend/data_tools/Pipfile.lock

Large diffs are not rendered by default.

169 changes: 88 additions & 81 deletions backend/ops_api/Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM oven/bun@sha256:9852e504d935fc3b238e10535deb94ff3e66064ad2187d79e57d625605e60c81
FROM oven/bun@sha256:bc86a6784c7b2987b28b73bd80eef1cabc438e4ca8950a8b1e8af1c31958c8d8
# hadolint ignore=DL3008
RUN apt-get update && apt-get -y --no-install-recommends install unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN useradd -ms /bin/bash app
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile.azure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ---- Build Stage ----
# alpine
FROM oven/bun@sha256:9852e504d935fc3b238e10535deb94ff3e66064ad2187d79e57d625605e60c81 as build
FROM oven/bun@sha256:bc86a6784c7b2987b28b73bd80eef1cabc438e4ca8950a8b1e8af1c31958c8d8 as build
RUN apt-get update && apt-get -y install unzip=6.0-26+deb11u1 --no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*

WORKDIR /home/bun/app
Expand Down
Binary file modified frontend/bun.lockb
Binary file not shown.
6 changes: 3 additions & 3 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"react-select": "5.8.1",
"sass": "1.77.8",
"sass-loader": "14.2.1",
"vest": "5.4.2"
"vest": "5.4.3"
},
"devDependencies": {
"@eslint/compat": "1.1.1",
Expand Down Expand Up @@ -63,11 +63,11 @@
"globals": "15.9.0",
"history": "5.3.0",
"jose": "5.6.3",
"jsdom": "25.0.0",
"jsdom": "25.0.1",
"msw": "2.3.5",
"prettier": "3.3.3",
"redux-mock-store": "1.5.4",
"vite": "5.4.6",
"vite": "5.4.7",
"vite-jsconfig-paths": "2.0.1",
"vite-plugin-babel-macros": "1.0.6",
"vite-plugin-eslint": "1.8.1",
Expand Down

0 comments on commit d08f92b

Please sign in to comment.