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

Require Python 3.9+ and update dependencies #594

Merged
merged 3 commits into from
Aug 15, 2023
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
6 changes: 2 additions & 4 deletions .github/workflows/ci-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ jobs:
strategy:
matrix:
python-version:
- 3.7
- 3.8
- 3.9
- "3.10"
- "3.11"
steps:
- uses: actions/checkout@v3
- name: Install and check with black, pylint and pontos.version
Expand All @@ -31,10 +30,9 @@ jobs:
strategy:
matrix:
python-version:
- 3.7
- 3.8
- 3.9
- "3.10"
- "3.11"
steps:
- uses: actions/checkout@v3
- name: Install python, poetry and dependencies
Expand Down
9 changes: 1 addition & 8 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,6 @@ max-line-length=80
# Maximum number of lines in a module
max-module-lines=1000

# List of optional constructs for which whitespace checking is disabled. `dict-
# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
# `empty-line` allows space-only lines.
no-space-check=trailing-comma,
dict-separator

# Allow the body of a class to be on the same line as the declaration if body
# contains single statement.
single-line-class-stmt=no
Expand Down Expand Up @@ -472,4 +465,4 @@ valid-metaclass-classmethod-first-arg=mcs

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=builtins.Exception
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ A linting and QA check tool for NASL files

### Requirements

Python 3.7 and later is supported.
Python 3.9 and later is supported.

### Install using pip

Expand Down
511 changes: 251 additions & 260 deletions poetry.lock

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ classifiers=[
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", # pylint: disable=line-too-long
"Environment :: Console",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Operating System :: OS Independent",
"Topic :: Software Development :: Libraries :: Python Modules",
]
Expand All @@ -28,12 +27,12 @@ packages = [
]

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.9"
pontos = ">=22.7,<24.0"
codespell = "^2.0.0"
python-magic = "^0.4.25"
chardet = ">=4,<6"
validators = ">=0.18.2,<0.21.0"
validators = "^0.21.2"
gitpython = "^3.1.31"
charset-normalizer = "^3.2.0"

Expand All @@ -45,7 +44,7 @@ autohooks-plugin-isort = ">=22.3.0"

[tool.black]
line-length = 80
target-version = ['py37', 'py38', 'py39', 'py310']
target-version = ['py39', 'py310', 'py311']
exclude = '''
/(
\.git
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/test_cve_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@ def test_duplicate_cves(self):
self.assertEqual(len(results), 1)
self.assertIsInstance(results[0], LinterError)
self.assertEqual(
'VT is using CVE "CVE-2021-3807" multiple ' "times.",
'VT is using CVE "CVE-2021-3807" multiple times.',
results[0].message,
)
2 changes: 1 addition & 1 deletion troubadix/plugins/spelling.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
# "ure" is a Debian package, again too many hits for
# codespell.exclude.
PatternInFilePatternCheck(
r"(deb_(dla_)?[0-9]+(_[" r"0-9]+)?|gb_ubuntu_.+)\.nasl",
r"(deb_(dla_)?[0-9]+(_[0-9]+)?|gb_ubuntu_.+)\.nasl",
r"ure\s+==>\s+sure",
),
# gsf/PCIDSS VTs are currently using some german text parts
Expand Down