Skip to content

Commit 24dae9d

Browse files
committed
Use new Python 3.13+ classifiers
1 parent cbb09c4 commit 24dae9d

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ maintainers = [
1414
{ name="Guillaume VALADON" },
1515
{ name="Nils WEISS" },
1616
]
17-
license = { text="GPL-2.0-only" }
17+
license = "GPL-2.0-only"
1818
requires-python = ">=3.7, <4"
1919
description = "Scapy: interactive packet manipulation tool"
2020
keywords = [ "network" ]
@@ -26,7 +26,6 @@ classifiers = [
2626
"Intended Audience :: Science/Research",
2727
"Intended Audience :: System Administrators",
2828
"Intended Audience :: Telecommunications Industry",
29-
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
3029
"Programming Language :: Python :: 3",
3130
"Programming Language :: Python :: 3 :: Only",
3231
"Programming Language :: Python :: 3.7",

scapy/config.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -587,10 +587,10 @@ def __repr__(self):
587587
class ExtsManager(importlib.abc.MetaPathFinder):
588588
__slots__ = ["exts", "_loaded", "all_specs"]
589589

590-
SCAPY_PLUGIN_CLASSIFIER = 'Framework :: Scapy'
591-
GPLV2_CLASSIFIERS = [
592-
'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
593-
'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
590+
SCAPY_PLUGIN_CLASSIFIER = "Framework :: Scapy Plugin"
591+
ALLOWED_LICENCES = [
592+
"GPL-2.0-only",
593+
"GPL-2.0-or-later",
594594
]
595595

596596
def __init__(self):
@@ -639,8 +639,8 @@ def load(self):
639639
if pkg in self._loaded:
640640
continue
641641
if not any(
642-
v in self.GPLV2_CLASSIFIERS
643-
for k, v in distr.metadata.items() if k == 'Classifier'
642+
v in self.ALLOWED_LICENCES
643+
for k, v in distr.metadata.items() if k == 'License-Expression'
644644
):
645645
log_loading.warning(
646646
"'%s' has no GPLv2 classifier therefore cannot be loaded." % pkg # noqa: E501

0 commit comments

Comments
 (0)