File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ maintainers = [
14
14
{ name =" Guillaume VALADON" },
15
15
{ name =" Nils WEISS" },
16
16
]
17
- license = { text = " GPL-2.0-only" }
17
+ license = " GPL-2.0-only"
18
18
requires-python = " >=3.7, <4"
19
19
description = " Scapy: interactive packet manipulation tool"
20
20
keywords = [ " network" ]
@@ -26,7 +26,6 @@ classifiers = [
26
26
" Intended Audience :: Science/Research" ,
27
27
" Intended Audience :: System Administrators" ,
28
28
" Intended Audience :: Telecommunications Industry" ,
29
- " License :: OSI Approved :: GNU General Public License v2 (GPLv2)" ,
30
29
" Programming Language :: Python :: 3" ,
31
30
" Programming Language :: Python :: 3 :: Only" ,
32
31
" Programming Language :: Python :: 3.7" ,
Original file line number Diff line number Diff line change @@ -587,10 +587,10 @@ def __repr__(self):
587
587
class ExtsManager (importlib .abc .MetaPathFinder ):
588
588
__slots__ = ["exts" , "_loaded" , "all_specs" ]
589
589
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" ,
594
594
]
595
595
596
596
def __init__ (self ):
@@ -639,8 +639,8 @@ def load(self):
639
639
if pkg in self ._loaded :
640
640
continue
641
641
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 '
644
644
):
645
645
log_loading .warning (
646
646
"'%s' has no GPLv2 classifier therefore cannot be loaded." % pkg # noqa: E501
You can’t perform that action at this time.
0 commit comments