Skip to content

Commit 794a576

Browse files
authored
Update dependencies to fix issue with markupsafe breaking change (#35)
* Update setup.py * Create 202202211807.bugfix * fix secret list
1 parent cb81f4c commit 794a576

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
config-path: .gitleaks.toml
147147
- name: Check for secrets using detect-secrets
148148
run: |
149-
git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git'
149+
git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git' --exclude-files '.*_version.py'
150150
working-directory: .
151151

152152
build-and-test:

.secrets.baseline

+3-11
Original file line numberDiff line numberDiff line change
@@ -95,20 +95,12 @@
9595
".*\\.html$",
9696
".*\\.properties$",
9797
"ci.yml",
98-
"\\.git"
98+
"\\.git",
99+
".*_version.py"
99100
]
100101
}
101102
],
102103
"results": {
103-
"continuous_delivery_scripts/_version.py": [
104-
{
105-
"type": "Hex High Entropy String",
106-
"filename": "continuous_delivery_scripts/_version.py",
107-
"hashed_secret": "f3d16e7d1a0b93bedefb9247f07cb355f6be3e03",
108-
"is_verified": false,
109-
"line_number": 14
110-
}
111-
],
112104
"continuous_delivery_scripts/plugins/python.py": [
113105
{
114106
"type": "Secret Keyword",
@@ -433,5 +425,5 @@
433425
}
434426
]
435427
},
436-
"generated_at": "2022-02-17T16:37:22Z"
428+
"generated_at": "2022-02-21T18:17:19Z"
437429
}

DEVELOPMENT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,6 @@ For the latter, False positive keys are stored in the [baseline](./.secrets.base
187187

188188
To flag individual false positives add comment `# pragma: allowlist secret` to line with secret
189189

190-
To add all suspected secrets in the repository (excluding ones with an allow secret comment), run `detect-secrets scan --all-files --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git' > .secrets.baseline`
190+
To add all suspected secrets in the repository (excluding ones with an allow secret comment), run `detect-secrets scan --all-files --exclude-files 'Pipfile\.lock$' --exclude-files '.*\.html$' --exclude-files '.*\.properties$' --exclude-files 'ci.yml' --exclude-files '\.git' --exclude-files '.*_version.py' > .secrets.baseline`
191191

192192
If on Windows: then change the encoding of the .secrets.baseline file to UTF-8 then convert all `\` to `/` in the .secrets.baseline file

news/202202211807.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixing markupsafe version to solve Jinja's(dependency issue)[https://github.com/pallets/markupsafe/issues/284]

setup.py

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
"jellyfish",
7171
"jinja2==2.11.3",
7272
"dataclasses; python_version<'3.7'",
73+
# FIXME fixing markupsafe to solve https://github.com/pallets/markupsafe/issues/284 until jinja is upgraded
74+
"markupsafe==2.0.1",
7375
],
7476
license="Apache 2.0",
7577
long_description_content_type="text/markdown",

0 commit comments

Comments
 (0)