Skip to content

Commit 61eb054

Browse files
authored
feat: Remove support for python 3.6 (#1488) (#1498)
* Fixes #1488 Python 3.6 has reached end of life, so we will no longer support it and will no longer run tests using that version. * ci: change pyupgrade to --py37-plus * ci: Remove python 3.6 * doc: Update python 3.6+ to python3.7+ * feat: Upgrade to pyupgrade --py37-plus
1 parent 1a5227f commit 61eb054

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

.github/workflows/pythonapp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
strategy:
6767
matrix:
6868
os: [ubuntu-latest]
69-
python: ['3.6', '3.7', '3.9', '3.10']
69+
python: ['3.7', '3.9', '3.10']
7070
timeout-minutes: 20
7171
env:
7272
ACTIONS: 1

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
rev: v2.29.1
1414
hooks:
1515
- id: pyupgrade
16-
args: ["--py36-plus"]
16+
args: ["--py37-plus"]
1717

1818
- repo: https://github.com/pycqa/flake8
1919
rev: 4.0.1

cve_bin_tool/package_list_parser.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ def check_file(self):
196196
# Simulate installation on Debian based system using apt-get to check if the file is valid
197197
output = run(
198198
["xargs", "-a", input_file, "apt-get", "install", "-s"],
199-
stderr=PIPE,
200-
stdout=PIPE,
199+
capture_output=True,
201200
)
202201

203202
if output.returncode != 0:
@@ -211,8 +210,7 @@ def check_file(self):
211210
elif distro.id() in RPM_DISTROS:
212211
output = run(
213212
["xargs", "-a", input_file, "rpm", "-qi"],
214-
stderr=PIPE,
215-
stdout=PIPE,
213+
capture_output=True,
216214
)
217215

218216
not_installed_packages = re.findall(
@@ -225,8 +223,7 @@ def check_file(self):
225223
elif distro.id() in PACMAN_DISTROS:
226224
output = run(
227225
["xargs", "-a", input_file, "pacman", "-Qk"],
228-
stderr=PIPE,
229-
stdout=PIPE,
226+
capture_output=True,
230227
)
231228

232229
not_installed_packages = re.findall(

doc/MANUAL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ in the Input section.
215215
## Limitations
216216

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

221221
This tool does not scan for all possible known public vulnerabilities, it only

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"License :: OSI Approved :: GNU General Public License (GPL)",
3838
"Natural Language :: English",
3939
"Operating System :: OS Independent",
40-
"Programming Language :: Python :: 3.6",
4140
"Programming Language :: Python :: 3.7",
4241
"Programming Language :: Python :: 3.8",
4342
"Programming Language :: Python :: 3.9",

0 commit comments

Comments
 (0)