Skip to content

Commit

Permalink
Merge pull request #148 from swiftss-org/fix-failing-build
Browse files Browse the repository at this point in the history 
use github instead of gitlab for flake8 in pre-commit
  • Loading branch information
@szigyi
szigyi authored Mar 8, 2024
2 parents c41f75a + 0a90e3c commit ed0e332
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 51 deletions.
15 changes: 8 additions & 7 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repos:
args: [ '--baseline', '.pre-commit/.secrets.baseline' ]
exclude: (config/settings/test.py|/static|.html|local|README.md)
repo: https://github.com/Yelp/detect-secrets.git
rev: v0.14.2
rev: v1.4.0

- hooks:
- id: check-merge-conflict
Expand All @@ -23,7 +23,7 @@ repos:
- id: fix-encoding-pragma
args: [ --remove ]
repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v4.5.0

- hooks:
- id: isort
Expand All @@ -45,14 +45,15 @@ repos:
types:
- python
repo: https://github.com/ambv/black
rev: 20.8b1
rev: 24.2.0

- hooks:
- args:
- --config=.pre-commit/setup.cfg
id: flake8
repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
language_version: python3
repo: https://github.com/PyCQA/flake8
rev: 7.0.0

- hooks:
- entry: pylint --rcfile=.pre-commit/.pylintrc
Expand All @@ -70,10 +71,10 @@ repos:
args:
- --config=.pre-commit/pyproject.toml
repo: https://github.com/commitizen-tools/commitizen
rev: v2.1.0
rev: v3.18.0

- hooks:
- id: bandit
args: [ --verbose, -ll, --recursive, . ]
repo: https://github.com/PyCQA/bandit
rev: 1.6.3
rev: 1.7.7
130 changes: 86 additions & 44 deletions .pre-commit/.secrets.baseline
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"custom_plugin_paths": [],
"exclude": {
"files": null,
"lines": null
},
"generated_at": "2020-08-26T11:24:51Z",
"plugins_used": [
{
Expand All @@ -13,8 +8,8 @@
"name": "ArtifactoryDetector"
},
{
"base64_limit": 4.5,
"name": "Base64HighEntropyString"
"name": "Base64HighEntropyString",
"limit": 4.5
},
{
"name": "BasicAuthDetector"
Expand All @@ -23,8 +18,8 @@
"name": "CloudantDetector"
},
{
"hex_limit": 3,
"name": "HexHighEntropyString"
"name": "HexHighEntropyString",
"limit": 3
},
{
"name": "IbmCloudIamDetector"
Expand Down Expand Up @@ -61,143 +56,190 @@
"results": {
"api/tests/v1/test_auth.py": [
{
"type": "Secret Keyword",
"filename": "api/tests/v1/test_auth.py",
"hashed_secret": "6ac030a853851cefae01f9afe4b560cb3804ae41",
"is_secret": false,
"is_verified": false,
"line_number": 29,
"type": "Secret Keyword"
"is_secret": false
}
],
"docker/prod/docker-stack-compose.yml": [
{
"type": "Basic Auth Credentials",
"filename": "docker/prod/docker-stack-compose.yml",
"hashed_secret": "35675e68f4b5af7b995d9205ad0fc43842f16450",
"is_secret": true,
"is_verified": false,
"line_number": 25,
"type": "Basic Auth Credentials"
"is_secret": true
}
],
"docker/staging/docker-stack-compose.yml": [
{
"type": "Basic Auth Credentials",
"filename": "docker/staging/docker-stack-compose.yml",
"hashed_secret": "35675e68f4b5af7b995d9205ad0fc43842f16450",
"is_secret": true,
"is_verified": false,
"line_number": 25,
"type": "Basic Auth Credentials"
"is_secret": true
}
],
"dummy_data.json": [
{
"type": "Secret Keyword",
"filename": "dummy_data.json",
"hashed_secret": "62dc506a90c6ac69e66d5f1761f3b8f815b911db",
"is_secret": false,
"is_verified": false,
"line_number": 1,
"type": "Secret Keyword"
"is_secret": false
}
],
"features/google_chat_report_templates.py": [
{
"type": "Base64 High Entropy String",
"filename": "features/google_chat_report_templates.py",
"hashed_secret": "77acfd7b1e46d0737dc02c01cd2fde21ef9b3f0f",
"is_secret": false,
"is_verified": false,
"line_number": 9,
"type": "Base64 High Entropy String"
"is_secret": false
}
],
"features/lists.py": [
{
"type": "Secret Keyword",
"filename": "features/lists.py",
"hashed_secret": "3611920789d08b35567acd1fd02518d25c0774ed",
"is_secret": true,
"is_verified": false,
"line_number": 171,
"type": "Secret Keyword"
"is_secret": true
}
],
"openapi.yaml": [
{
"type": "Hex High Entropy String",
"filename": "openapi.yaml",
"hashed_secret": "e0bccebc14e7679dcf5982cba52a6405339c4e82",
"is_secret": false,
"is_verified": false,
"line_number": 2322,
"type": "Hex High Entropy String"
"is_secret": false
}
],
"project/management/commands/demo_init.py": [
{
"type": "Secret Keyword",
"filename": "project/management/commands/demo_init.py",
"hashed_secret": "d4a506c45b40f655ed9f17e3c0687dd5bced3aea",
"is_secret": false,
"is_verified": false,
"line_number": 37,
"type": "Secret Keyword"
"is_secret": false
}
],
"project/settings/testing.py": [
{
"type": "Basic Auth Credentials",
"filename": "project/settings/testing.py",
"hashed_secret": "a3864614b4346d8c5136d71b315058125c4a8629",
"is_secret": true,
"is_verified": false,
"line_number": 14,
"type": "Basic Auth Credentials"
"is_secret": true
}
],
"static/vendor/font-awesome/css/font-awesome.css": [
{
"type": "Secret Keyword",
"filename": "static/vendor/font-awesome/css/font-awesome.css",
"hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
"is_secret": false,
"is_verified": false,
"line_number": 1735,
"type": "Secret Keyword"
"is_secret": false
}
],
"static/vendor/font-awesome/css/font-awesome.min.css": [
{
"type": "Secret Keyword",
"filename": "static/vendor/font-awesome/css/font-awesome.min.css",
"hashed_secret": "edb76ba48d7516179bbbe9947dc011e959085f08",
"is_secret": false,
"is_verified": false,
"line_number": 4,
"type": "Secret Keyword"
"is_secret": false
}
],
"static/vendor/font-awesome/less/icons.less": [
{
"type": "Secret Keyword",
"filename": "static/vendor/font-awesome/less/icons.less",
"hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
"is_secret": false,
"is_verified": false,
"line_number": 572,
"type": "Secret Keyword"
"is_secret": false
}
],
"static/vendor/font-awesome/less/variables.less": [
{
"type": "Secret Keyword",
"filename": "static/vendor/font-awesome/less/variables.less",
"hashed_secret": "6f613592cdfc34fe6ee7b16cbc47ddee53c781c5",
"is_secret": false,
"is_verified": false,
"line_number": 698,
"type": "Secret Keyword"
"is_secret": false
}
],
"static/vendor/font-awesome/scss/_icons.scss": [
{
"type": "Secret Keyword",
"filename": "static/vendor/font-awesome/scss/_icons.scss",
"hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
"is_secret": false,
"is_verified": false,
"line_number": 572,
"type": "Secret Keyword"
"is_secret": false
}
],
"static/vendor/font-awesome/scss/_variables.scss": [
{
"type": "Secret Keyword",
"filename": "static/vendor/font-awesome/scss/_variables.scss",
"hashed_secret": "6f613592cdfc34fe6ee7b16cbc47ddee53c781c5",
"is_secret": false,
"is_verified": false,
"line_number": 698,
"type": "Secret Keyword"
"is_secret": false
}
]
},
"version": "0.14.2",
"word_list": {
"file": null,
"hash": null
}
"version": "1.4.0",
"filters_used": [
{
"path": "detect_secrets.filters.allowlist.is_line_allowlisted"
},
{
"path": "detect_secrets.filters.heuristic.is_sequential_string"
},
{
"path": "detect_secrets.filters.heuristic.is_potential_uuid"
},
{
"path": "detect_secrets.filters.heuristic.is_likely_id_string"
},
{
"path": "detect_secrets.filters.heuristic.is_templated_secret"
},
{
"path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
},
{
"path": "detect_secrets.filters.heuristic.is_indirect_reference"
},
{
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
"min_level": 2
},
{
"path": "detect_secrets.filters.heuristic.is_lock_file"
},
{
"path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
},
{
"path": "detect_secrets.filters.heuristic.is_swagger_file"
}
]
}

0 comments on commit ed0e332

Please sign in to comment.