Skip to content
This repository has been archived by the owner on Jan 27, 2023. It is now read-only.

Bump Syft/Grype dependencies #1392

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Bump Syft/Grype dependencies #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c36d94b
Bump Syft/Grype dependencies
brennoo Sep 28, 2022
4f63d62
remove ancho.re tests and update fixtures
brennoo Sep 29, 2022
91355d0
fix typos in centos fixtures
brennoo Sep 29, 2022
a9e4223
black format
brennoo Sep 29, 2022
6c51609
update bsdutils, libfdisk1 debian fixtures
brennoo Sep 30, 2022
00ec98b
Remove legacy functional tests from CI
brennoo Sep 30, 2022
54e5a20
remove functional_tests_38_legacy from nightly and default workflows
brennoo Sep 30, 2022
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
15 changes: 0 additions & 15 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,6 @@ workflows:
name: test_container_dev
requires:
- build
- functional_tests:
name: functional_tests_38_legacy
tox_env: "py38"
vulnerabilities_provider: "legacy"
requires:
- build
- functional_tests:
name: functional_tests_38_grype
vulnerabilities_provider: "grype"
Expand All @@ -433,7 +427,6 @@ workflows:
filters: *filter_release_branch
requires:
- functional_tests_38_grype
- functional_tests_38_legacy
- integration_tests_38
- test_container_dev
- grype_vuln_scan:
Expand Down Expand Up @@ -475,13 +468,6 @@ workflows:
filters: *filter_nightly
requires:
- build
- functional_tests:
name: functional_tests_38_legacy
vulnerabilities_provider: "legacy"
tox_env: "py38"
filters: *filter_nightly
requires:
- build
- functional_tests:
name: functional_tests_38_grype
vulnerabilities_provider: "grype"
Expand All @@ -502,7 +488,6 @@ workflows:
context: dockerhub
filters: *filter_nightly
requires:
- functional_tests_38_legacy
- functional_tests_38_grype
- integration_tests_38
- cli_smoke_tests_38
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ENV LANG=en_US.UTF-8
ENV LC_ALL=C.UTF-8

# environment variables for dependent binary versions
ENV SYFT_VERSION=v0.33.0
ENV GRYPE_VERSION=v0.27.3
ENV SYFT_VERSION=v0.57.0
ENV GRYPE_VERSION=v0.50.2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be already bumped to 0.55

Suggested change
ENV GRYPE_VERSION=v0.50.2
ENV GRYPE_VERSION=v0.55.0

ENV PIP_VERSION=21.0.1

# setup build artifact directory
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
black
isort
pylint
pylint==v2.10.2
2 changes: 1 addition & 1 deletion scripts/ci/lint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euvo pipefail
# Optional - only used for print_colorized
source anchore-ci/utils

hash pylint || python -m pip install -q pylint
hash pylint || python -m pip install -q pylint==v2.10.2

print_colorized INFO "Linting Anchore Engine code."; echo

Expand Down
272 changes: 136 additions & 136 deletions tests/functional/clients/standalone/package_list/fixtures/centos.py
View file
Open in desktop

Large diffs are not rendered by default.

252 changes: 130 additions & 122 deletions tests/functional/clients/standalone/package_list/fixtures/debian.py
View file
Open in desktop

Large diffs are not rendered by default.

Empty file removed tests/integration/clients/__init__.py
View file
Open in desktop
Empty file.
86 changes: 0 additions & 86 deletions tests/integration/clients/test_anchoreio_feeds.py
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions tests/integration/services/policy_engine/feeds/test_download.py
View file
Open in desktop

This file was deleted.