Skip to content

Commit

Permalink
Merge branch 'main' into pwu420/husky-pre-commit-permissions-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
openrijal authored Jan 16, 2024
2 parents e12166c + 590678b commit 87801e4
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @JGSweets @ksneab7 @taylorfturner @micdavis @tyfarnan
* @capitalone/fma-admin-team
5 changes: 5 additions & 0 deletions clients/javascript_client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,10 @@
"lint": "eslint fma_connect --ignore-path .eslintignore --ext .ts --format table",
"prepare": "cd ../../ && husky install clients/javascript_client/.husky",
"test": "jest --coverage --passWithNoTests"
},
"overrides": {
"fetch-mock": {
"@babel/traverse": "7.23.2"
}
}
}
2 changes: 1 addition & 1 deletion clients/python_client/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ verify_ssl = true
name = "pypi"

[packages]
requests = "2.27.1"
requests = "2.31.0"

[dev-packages]
pytest = "*"
Expand Down
2 changes: 1 addition & 1 deletion clients/python_client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
requests>=2.27.1
requests>=2.31.0
2 changes: 1 addition & 1 deletion connectors/django/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pre-commit = "*"
fma-core = {path = "./../../fma-core", editable = true}

[packages]
Django = "4.1.10"
Django = "4.1.13"
django-q = "1.3.9"
django-mptt = "0.13.4"
numpy = "1.22.2"
Expand Down
2 changes: 1 addition & 1 deletion connectors/django/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==4.1.10
Django==4.1.13
django-q==1.3.9
django-mptt==0.13.4
numpy==1.22.2
Expand Down

0 comments on commit 87801e4

Please sign in to comment.