Skip to content

Commit

Permalink
Merge branch 'main' into OPS-2389/update-sql-roles
Browse files Browse the repository at this point in the history
  • Loading branch information
rajohnson90 authored Sep 24, 2024
2 parents 9467843 + de542b7 commit b5c555f
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion backend/data_tools/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ desert = "2022.9.22"
sqlalchemy-continuum = "==1.4.2"
marshmallow-sqlalchemy = "==1.0.0"
marshmallow-enum = "==1.5.1"
alembic = "==1.13.2"
alembic = "==1.13.3"
alembic-postgresql-enum = "==1.3.0"

[dev-packages]
Expand Down
16 changes: 8 additions & 8 deletions backend/data_tools/Pipfile.lock

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

2 changes: 1 addition & 1 deletion backend/ops_api/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sqlalchemy-continuum = "==1.4.2"
marshmallow-sqlalchemy = "==1.0.0"
azure-storage-blob = "==12.22.0"
azure-identity = "==1.17.1"
alembic = "==1.13.2"
alembic = "==1.13.3"
alembic-postgresql-enum = "==1.3.0"
PyYAML = "==6.0.2"

Expand Down
16 changes: 8 additions & 8 deletions backend/ops_api/Pipfile.lock

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

Binary file modified frontend/bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"devDependencies": {
"@eslint/compat": "1.1.1",
"@eslint/js": "9.10.0",
"@eslint/js": "9.11.1",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
Expand Down

0 comments on commit b5c555f

Please sign in to comment.