Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addressed numerous package dependency vulnerabilities. #148

Merged
merged 3 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci-unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
container: python:3.8
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
# Cache local python environment artifacts for the current python version
# and poetry lockfile hash.
- uses: actions/cache@v2
- uses: actions/cache@v4
id: env-cache
with:
# Confirmed that the `.local` directory doesn't exist until the
Expand All @@ -57,12 +57,12 @@ jobs:
container: python:3.8
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
# Cache local python environment artifacts for the current python version
# and poetry lockfile hash.
- uses: actions/cache@v2
- uses: actions/cache@v4
id: env-cache
with:
# Confirmed that the `.local` directory doesn't exist until the
Expand Down Expand Up @@ -96,12 +96,12 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
# Cache local python environment artifacts for the current python version
# and poetry lockfile hash.
- uses: actions/cache@v2
- uses: actions/cache@v4
id: env-cache
with:
# Confirmed that the `.local` directory doesn't exist until the
Expand Down
12 changes: 11 additions & 1 deletion docs/release_notes/pending_release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@ Pending Release Notes
Updates / New Features
----------------------

CI/CD

* Updated to use `checkout@v4` and `cache@v4` instead of `*@v2`.

Fixes
-----

Tests
Dependencies

* Fixed `numpy` dependency versions for downstream resolution.

* Jupyter notebooks now installed with `notebook` instead of `jupyter`.

* Increased the lower bound of `tqdm` to `4.66.3` to address `CVE-2024-34062`.

* Ran `poetry update` to update `poetry.lock` for vulnerability scanning.
4,691 changes: 2,711 additions & 1,980 deletions poetry.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ scipy = [
click = ">=8.0.3"
setuptools = "*"
# Optionals for "example" extra
jupyter = { version = ">=1.0.0", optional = true }
notebook = { version = ">=7.0.7", optional = true }
matplotlib = { version=">=3.4.1", optional = true }
papermill = { version = ">=2.3.3", optional = true }
torch = {version = ">=1.9.0,!=2.0.1", optional = true}
torchvision = {version = ">=0.10.0", optional = true}
tqdm = { version = ">=4.45.0", optional = true }
tqdm = { version = "4.66.3", optional = true } # CVE-2024-34062
# Optionals for "tools" extra"
kwcoco = { version = ">=0.2.18", optional = true}
pyyaml = {version = ">=6.0.1", optional = true, python = ">=3.12"}
shapely = {version = ">=2.0.2", optional = true, python = ">=3.12"}

[tool.poetry.extras]
example_deps = [ "jupyter", "matplotlib", "papermill", "torch", "torchvision", "tqdm" ]
example_deps = [ "notebook", "matplotlib", "papermill", "torch", "torchvision", "tqdm" ]
tools = [ "kwcoco", "matplotlib", "pyyaml", "shapely" ]

[tool.poetry.dev-dependencies]
Expand Down Expand Up @@ -103,7 +103,7 @@ coverage = ">=6.5.0"
pytest = ">=7.2.0"
pytest-cov = ">=4.0.0"
# Utility
ipython = ">=8.6.0"
notebook = ">=7.0.7"

[tool.poetry.scripts]
sal-on-coco-dets= "xaitk_saliency.utils.bin.sal_on_coco_dets:sal_on_coco_dets"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TestPerturbationOcclusion:
def teardown(self) -> None:
# Collect any temporary implementations so they are not returned during
# later `*.get_impl()` requests.
gc.collect()
gc.collect() # pragma: no cover

def test_configuration(self) -> None:
""" Test configuration suite using known simple implementations. """
Expand Down
2 changes: 1 addition & 1 deletion tests/impls/gen_image_similarity_blackbox_sal/test_sbsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TestBlackBoxSBSM:
def teardown(self) -> None:
# Collect any temporary implementations so they are not returned during
# later `*.get_impl()` requests.
gc.collect()
gc.collect() # pragma: no cover

def test_configuration(self) -> None:
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class TestPerturbationOcclusion:
def teardown(self) -> None:
# Collect any temporary implementations so they are not returned during
# later `*.get_impl()` requests.
gc.collect()
gc.collect() # pragma: no cover

def test_configuration(self) -> None:
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TestPerturbationOcclusion:
def teardown(self) -> None:
# Collect any temporary implementations so they are not returned during
# later `*.get_impl()` requests.
gc.collect()
gc.collect() # pragma: no cover

def test_configuration(self) -> None:
"""
Expand Down
Loading