Skip to content

Commit 7df0f1b

Browse files
authored
Clarified safety ignore-unpinned; Addressed safety issues (#2093)
Signed-off-by: Andreas Maier <maiera@de.ibm.com>
1 parent 0e5c969 commit 7df0f1b

6 files changed

Lines changed: 16 additions & 10 deletions

.safety-policy-develop.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ security:
1818
ignore-cvss-unknown-severity: False
1919

2020
# Ignore unpinned requirements.
21-
# Should be set to False.
21+
# Default is true. "Unpinned" in this case means anything else but "==".
22+
# Since we are checking against the minimum-constraints file, this check
23+
# is enabled (false).
2224
ignore-unpinned-requirements: False
2325

2426
# List of specific vulnerabilities to ignore.
@@ -30,6 +32,8 @@ security:
3032
reason: Disputed issue in jinja2 version 3.1.3 - No known fix
3133
79993:
3234
reason: Fixed jupyterlab version 4.4.8 requires Python>=3.9 and other upgrades
35+
82754:
36+
reason: Fixed filelock version 3.20.1 requires Python>=3.10 and is used there
3337

3438
# Continue with exit code 0 when vulnerabilities are found.
3539
continue-on-vulnerability-error: False

.safety-policy-install.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ security:
1818
ignore-cvss-unknown-severity: False
1919

2020
# Ignore unpinned requirements.
21-
# Should be set to False.
21+
# Default is true. "Unpinned" in this case means anything else but "==".
22+
# Since we are checking against the minimum-constraints file, this check
23+
# is enabled (false).
2224
ignore-unpinned-requirements: False
2325

2426
# List of specific vulnerabilities to ignore.

dev-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dparse>=0.6.4
6363
ruamel.yaml>=0.17.21
6464
click>=8.0.2
6565
Authlib>=1.6.5
66-
marshmallow>=3.15.0
66+
marshmallow>=3.26.2
6767
pydantic>=2.12.0
6868
pydantic_core>=2.41.1
6969
#safety 3.6.1 depends on typer>=0.16.0
@@ -138,7 +138,7 @@ notebook>=7.2.2; sys_platform != 'win32' or python_version <= '3.12'
138138
jupyter>=1.0.0; sys_platform != 'win32' or python_version <= '3.12'
139139
jupyter-console>=6.6.3; sys_platform != 'win32' or python_version <= '3.12'
140140
ipywidgets>=8.0.5; sys_platform != 'win32' or python_version <= '3.12'
141-
nbconvert>=7.2.10; sys_platform != 'win32' or python_version <= '3.12'
141+
nbconvert>=7.17.0; sys_platform != 'win32' or python_version <= '3.12'
142142
nbclient>=0.7.4; sys_platform != 'win32' or python_version <= '3.12'
143143
nbformat>=5.8.0; sys_platform != 'win32' or python_version <= '3.12'
144144
qtconsole>=5.4.2; sys_platform != 'win32' or python_version <= '3.12'

minimum-constraints-develop.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ dparse==0.6.4
5050
ruamel.yaml==0.17.21
5151
click==8.0.2
5252
Authlib==1.6.5
53-
marshmallow==3.15.0
53+
marshmallow==3.26.2
5454
pydantic==2.12.0
5555
pydantic_core==2.41.1
5656
typer==0.16.0
@@ -112,7 +112,7 @@ notebook==7.2.2; sys_platform != 'win32' or python_version <= '3.12'
112112
jupyter==1.0.0; sys_platform != 'win32' or python_version <= '3.12'
113113
jupyter-console==6.6.3; sys_platform != 'win32' or python_version <= '3.12'
114114
ipywidgets==8.0.5; sys_platform != 'win32' or python_version <= '3.12'
115-
nbconvert==7.2.10; sys_platform != 'win32' or python_version <= '3.12'
115+
nbconvert==7.17.0; sys_platform != 'win32' or python_version <= '3.12'
116116
nbclient==0.7.4; sys_platform != 'win32' or python_version <= '3.12'
117117
nbformat==5.8.0; sys_platform != 'win32' or python_version <= '3.12'
118118
qtconsole==5.4.2; sys_platform != 'win32' or python_version <= '3.12'
@@ -170,8 +170,8 @@ dataclasses==0.8
170170
decorator==4.0.11
171171
defusedxml==0.7.1
172172
distlib==0.3.7
173-
# safety 3.4.0 depends on filelock~=3.16.1
174-
filelock==3.16.1
173+
filelock==3.16.1; python_version == '3.9'
174+
filelock==3.20.1; python_version >= '3.10'
175175
gitdb==4.0.8
176176
gitdb2==2.0.0
177177
html5lib==1.1

minimum-constraints-install.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ websocket-client==1.8.0
3232

3333
certifi==2024.07.04
3434

35-
urllib3==2.6.0
35+
urllib3==2.6.3
3636

3737

3838
# Direct dependencies for install of extra 'testutils' (must be consistent with extra-testutils-requirements)

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ certifi>=2024.07.04
3535
# Functional dependencies on urllib3 versions:
3636
# - IncompleteRead fix: Distinguishing too much from not enough response data
3737
# requires >=2.2.1
38-
urllib3>=2.6.0
38+
urllib3>=2.6.3
3939

4040

4141
# Indirect dependencies for install that are needed for some reason (must be consistent with minimum-constraints-install.txt)

0 commit comments

Comments
 (0)