Skip to content

feat: Remove support for python 3.6 (#1488) #1498

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

Merged
merged 5 commits into from
Jan 4, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: ['3.6', '3.7', '3.9', '3.10']
python: ['3.7', '3.9', '3.10']
timeout-minutes: 20
env:
ACTIONS: 1
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
rev: v2.29.1
hooks:
- id: pyupgrade
args: ["--py36-plus"]
args: ["--py37-plus"]

- repo: https://github.com/pycqa/flake8
rev: 4.0.1
Expand Down
9 changes: 3 additions & 6 deletions cve_bin_tool/package_list_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ def check_file(self):
# Simulate installation on Debian based system using apt-get to check if the file is valid
output = run(
["xargs", "-a", input_file, "apt-get", "install", "-s"],
stderr=PIPE,
stdout=PIPE,
capture_output=True,
)

if output.returncode != 0:
Expand All @@ -211,8 +210,7 @@ def check_file(self):
elif distro.id() in RPM_DISTROS:
output = run(
["xargs", "-a", input_file, "rpm", "-qi"],
stderr=PIPE,
stdout=PIPE,
capture_output=True,
)

not_installed_packages = re.findall(
Expand All @@ -225,8 +223,7 @@ def check_file(self):
elif distro.id() in PACMAN_DISTROS:
output = run(
["xargs", "-a", input_file, "pacman", "-Qk"],
stderr=PIPE,
stdout=PIPE,
capture_output=True,
)

not_installed_packages = re.findall(
Expand Down
2 changes: 1 addition & 1 deletion doc/MANUAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ in the Input section.
## Limitations

The last release of this tool to support python 2.7 is 0.3.1. Please use
python 3.6+ for development and future versions. Linux and Windows are
python 3.7+ for development and future versions. Linux and Windows are
supported, as is usage within cygwin on windows.

This tool does not scan for all possible known public vulnerabilities, it only
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"License :: OSI Approved :: GNU General Public License (GPL)",
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down