diff --git a/binary-analysis/scancode-compiledcode/src/cppincludes/__init__.py b/binary-analysis/scancode-compiledcode/src/cppincludes/__init__.py index 13e7b6c..852fa77 100644 --- a/binary-analysis/scancode-compiledcode/src/cppincludes/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/cppincludes/__init__.py @@ -22,11 +22,7 @@ # ScanCode is a free software code scanning tool from nexB Inc. and others. # Visit https://github.com/nexB/scancode-toolkit/ for support and download. -from __future__ import absolute_import -from __future__ import unicode_literals - import re -from collections import OrderedDict from functools import partial from itertools import chain @@ -45,7 +41,7 @@ class CPPIncludesScanner(ScanPlugin): """ Collect the #includes statements in a C/C++ file. """ - resource_attributes = OrderedDict( + resource_attributes = dict( cpp_includes=attr.ib(default=attr.Factory(list), repr=False), ) diff --git a/binary-analysis/scancode-compiledcode/src/dwarf/__init__.py b/binary-analysis/scancode-compiledcode/src/dwarf/__init__.py index 70db241..444ae60 100644 --- a/binary-analysis/scancode-compiledcode/src/dwarf/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/dwarf/__init__.py @@ -27,7 +27,6 @@ import os -from collections import OrderedDict from functools import partial from itertools import chain diff --git a/binary-analysis/scancode-compiledcode/src/dwarf/dwarf.py b/binary-analysis/scancode-compiledcode/src/dwarf/dwarf.py index a24eee7..32f82b8 100644 --- a/binary-analysis/scancode-compiledcode/src/dwarf/dwarf.py +++ b/binary-analysis/scancode-compiledcode/src/dwarf/dwarf.py @@ -31,7 +31,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import posixpath import re @@ -141,7 +140,7 @@ def cleanup(self): if x not in self.original_source_files) def asdict(self): - return OrderedDict([ + return dict([ ('original_source_files', self.original_source_files), ('included_source_files', self.included_source_files) ]) diff --git a/binary-analysis/scancode-compiledcode/src/elf/__init__.py b/binary-analysis/scancode-compiledcode/src/elf/__init__.py index b602766..415688e 100644 --- a/binary-analysis/scancode-compiledcode/src/elf/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/elf/__init__.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import unicode_literals -from collections import OrderedDict from functools import partial from itertools import chain @@ -46,7 +45,7 @@ class ELFScanner(ScanPlugin): """ Collect the names of shared objects/libraries needed by an Elf binary file. """ - resource_attributes = OrderedDict( + resource_attributes = dict( elf_needed_library=attr.ib(default=attr.Factory(list), repr=False), ) diff --git a/binary-analysis/scancode-compiledcode/src/generatedcode/__init__.py b/binary-analysis/scancode-compiledcode/src/generatedcode/__init__.py index 8e95244..add9d14 100644 --- a/binary-analysis/scancode-compiledcode/src/generatedcode/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/generatedcode/__init__.py @@ -26,7 +26,6 @@ from __future__ import unicode_literals -from collections import OrderedDict from collections import namedtuple from functools import partial from itertools import chain @@ -50,7 +49,7 @@ class GeneratedCodeScanner(ScanPlugin): """ Parse the snippet that is possibly generated code. """ - resource_attributes = OrderedDict( + resource_attributes = dict( generatedcode=attr.ib(default=attr.Factory(list), repr=False), ) diff --git a/binary-analysis/scancode-compiledcode/src/gwt/__init__.py b/binary-analysis/scancode-compiledcode/src/gwt/__init__.py index da21195..524e74e 100644 --- a/binary-analysis/scancode-compiledcode/src/gwt/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/gwt/__init__.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import unicode_literals -from collections import OrderedDict from collections import namedtuple from functools import partial from itertools import chain @@ -48,7 +47,7 @@ class GWTScanner(ScanPlugin): symbols. Used to infer the relationship between the compiled JavaScript and the original Java Source code. """ - resource_attributes = OrderedDict( + resource_attributes = dict( gwt=attr.ib(default=attr.Factory(list), repr=False), ) diff --git a/binary-analysis/scancode-compiledcode/src/javaclass/__init__.py b/binary-analysis/scancode-compiledcode/src/javaclass/__init__.py index 68ff86c..50c7fcb 100644 --- a/binary-analysis/scancode-compiledcode/src/javaclass/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/javaclass/__init__.py @@ -25,9 +25,8 @@ from __future__ import absolute_import from __future__ import unicode_literals -from StringIO import StringIO +from io import StringIO -from collections import OrderedDict from functools import partial from itertools import chain from struct import unpack @@ -36,11 +35,12 @@ import attr +from commoncode.cliutils import PluggableCommandLineOption as CommandLineOption +from commoncode.cliutils import SCAN_GROUP from commoncode import fileutils from plugincode.scan import ScanPlugin from plugincode.scan import scan_impl -from scancode import CommandLineOption -from scancode import SCAN_GROUP + from typecode import contenttype from sourcecode import kernel @@ -54,8 +54,8 @@ class JavaClassScanner(ScanPlugin): """ Scan java class information from the resource. """ - resource_attributes = OrderedDict( - javaclass=attr.ib(default=attr.Factory(OrderedDict), repr=False), + resource_attributes = dict( + javaclass=attr.ib(default=attr.Factory(dict), repr=False), ) options = [ @@ -81,17 +81,17 @@ def scan_javaclass(location, **kwargs): if not T.is_java_class: return - javaclass_data = OrderedDict() + javaclass_data = dict() SHOW_CONSTS = 1 data = open(location, 'rb').read() f = StringIO(data) c = javaclass.Class(f) - - javaclass_data['Version'] = 'Version: %i.%i (%s)' % ( c.version[1], c.version[0], getJavacVersion(c.version)) + + javaclass_data['Version'] = 'Version: %i.%i (%s)' % (c.version[1], c.version[0], getJavacVersion(c.version)) if SHOW_CONSTS: javaclass_data['Constants Pool'] = str(len(c.constants)) - constants = OrderedDict() + constants = dict() for i in range(1, len(c.constants)): const = c.constants[i] @@ -100,7 +100,7 @@ def scan_javaclass(location, **kwargs): # double and long constants take 2 slots, we must skip the 'None' one if not const: continue - constant_data = OrderedDict() + constant_data = dict() if const[0] == CONSTANT_Fieldref: constant_data['Field'] = str(c.constants[const[1]][1]) @@ -111,40 +111,39 @@ def scan_javaclass(location, **kwargs): constant_data['InterfaceMethod'] = str(c.constants[const[1]][1]) elif const[0] == CONSTANT_String: - constant_data['String'] = str(const[1]) + constant_data['String'] = str(const[1]) elif const[0] == CONSTANT_Float: - constant_data['Float'] = str(const[1]) + constant_data['Float'] = str(const[1]) elif const[0] == CONSTANT_Integer: - constant_data['Integer'] = str(const[1]) + constant_data['Integer'] = str(const[1]) elif const[0] == CONSTANT_Double: - constant_data['Double'] = str(const[1]) + constant_data['Double'] = str(const[1]) elif const[0] == CONSTANT_Long: - constant_data['Long'] = str(const[1]) + constant_data['Long'] = str(const[1]) # elif const[0] == CONSTANT_NameAndType: # print 'NameAndType\t\t FIXME!!!' elif const[0] == CONSTANT_Utf8: - constant_data['Utf8'] = str(const[1]) + constant_data['Utf8'] = str(const[1]) elif const[0] == CONSTANT_Class: - constant_data['Class'] = str(c.constants[const[1]][1]) + constant_data['Class'] = str(c.constants[const[1]][1]) elif const[0] == CONSTANT_NameAndType: - constant_data['NameAndType'] = str(const[1]) + ', ' + str(const[2]) + constant_data['NameAndType'] = str(const[1]) + ', ' + str(const[2]) else: constant_data['Unknown(' + str(const[0]) + ')'] = str(const[1]) - + constants[i] = constant_data - - javaclass_data['Constants'] = constants + javaclass_data['Constants'] = constants - access =[] + access = [] if c.access & ACC_INTERFACE: access.append('Interface ') if c.access & ACC_SUPER_OR_SYNCHRONIZED: @@ -173,7 +172,7 @@ def scan_javaclass(location, **kwargs): interfaces.append(str(inter)) if interfaces: javaclass_data['Interfaces'] = interfaces - - return OrderedDict( + + return dict( javaclass=javaclass_data, ) diff --git a/binary-analysis/scancode-compiledcode/src/javaclass/javaclass.py b/binary-analysis/scancode-compiledcode/src/javaclass/javaclass.py index bc92492..851f7ef 100644 --- a/binary-analysis/scancode-compiledcode/src/javaclass/javaclass.py +++ b/binary-analysis/scancode-compiledcode/src/javaclass/javaclass.py @@ -1,11 +1,8 @@ -from __future__ import absolute_import - import sys import os from struct import unpack -from StringIO import StringIO - +from io import StringIO """ A python lib for parsing Java class files, suitable for static @@ -20,7 +17,7 @@ """ __author__ = 'Jason Petrone ' -__version__ = '1.0' +__version__ = '21.3' # Class file format documented at: # http://java.sun.com/docs/books/vmspec/html/ClassFile.doc.html @@ -141,6 +138,7 @@ def getAccessFromFlags(flags): class MethodDesc: + def __init__(self, descStr): self.args = [] self.descStr = descStr @@ -218,6 +216,7 @@ class Method: Represents a Java method. The bytecode for the method is stored under the key "Code" in attrs. """ + def __init__(self, klass, access, name, desc, attrs): self.klass = klass self.access = access @@ -258,7 +257,7 @@ def __repr__(self): class Field: def __init__(self, klass, access, name, desc, attrs): - # print 'FIELD ' + str([klass, access, name, desc, attrs]) + # print('FIELD ' + str([klass, access, name, desc, attrs])) self.klass = klass self.access = access self.name = name @@ -287,6 +286,7 @@ def __str__(self): class FieldRef: + def __init__(self, klass, name, desc): self.klass = klass self.name = name @@ -294,6 +294,7 @@ def __init__(self, klass, name, desc): class MethodRef: + def __init__(self, _class, name, desc): self._class = _class self.name = name @@ -305,6 +306,7 @@ def __repr__(self): class Class: + def __init__(self, f): """ Load a java class from file object "f" @@ -312,7 +314,7 @@ def __init__(self, f): print(f.read(4)) # magic self.version = unpack('>HH', f.read(4)) - # print unpack('>H', f.read(2)) + # print(unpack('>H', f.read(2))) [constCount] = unpack('>H', f.read(2)) self.constants = [[CONSTANT_Utf8, 'reserved']] @@ -348,7 +350,7 @@ def __init__(self, f): elif tag == CONSTANT_Long: [hi] = unpack('>l', f.read(4)) [lo] = unpack('>l', f.read(4)) - self.constants.append([tag, ((long(hi) << 4) + lo)]) + self.constants.append([tag, ((int(hi) << 4) + lo)]) # takes up 2 constant pool spots self.constants.append(None) # this needs to be considered in dumpClass! i += 1 @@ -366,10 +368,9 @@ def __init__(self, f): [className] = unpack('>H', f.read(2)) self.name = self.constants[self.constants[className][1]][1] self.package = os.path.dirname(self.name).replace('/', '.') - # print self.version + # print(self.version) [className] = unpack('>H', f.read(2)) - # added as part of #711: java.lang.Object is an exceptional case if self.name != 'java/lang/Object': self.superClass = self.constants[self.constants[className][1]][1] @@ -493,12 +494,11 @@ def dumpClass(path): data = open(path, 'rb').read() f = StringIO(data) c = Class(f) - # print file name - print 'Version: %i.%i (%s)' \ - % (c.version[1], c.version[0], getJavacVersion(c.version)) + # print(file name) + print('Version: %i.%i (%s)' % (c.version[1], c.version[0], getJavacVersion(c.version),)) if SHOW_CONSTS: - print 'Constants Pool: ' + str(len(c.constants)) + print('Constants Pool: ' + str(len(c.constants))) for i in range(1, len(c.constants)): const = c.constants[i] @@ -507,48 +507,46 @@ def dumpClass(path): # double and long constants take 2 slots, we must skip the 'None' one if not const: continue - sys.stdout.write(' ' + str(i) + '\t') if const[0] == CONSTANT_Fieldref: - print 'Field\t\t' + str(c.constants[const[1]][1]) + print('Field\t\t' + str(c.constants[const[1]][1])) elif const[0] == CONSTANT_Methodref: - print 'Method\t\t' + str(c.constants[const[1]][1]) + print('Method\t\t' + str(c.constants[const[1]][1])) elif const[0] == CONSTANT_InterfaceMethodref: - print 'InterfaceMethod\t\t' + str(c.constants[const[1]][1]) + print('InterfaceMethod\t\t' + str(c.constants[const[1]][1])) elif const[0] == CONSTANT_String: - print 'String\t\t' + str(const[1]) + print('String\t\t' + str(const[1])) elif const[0] == CONSTANT_Float: - print 'Float\t\t' + str(const[1]) + print('Float\t\t' + str(const[1])) elif const[0] == CONSTANT_Integer: - print 'Integer\t\t' + str(const[1]) + print('Integer\t\t' + str(const[1])) elif const[0] == CONSTANT_Double: - print 'Double\t\t' + str(const[1]) + print('Double\t\t' + str(const[1])) elif const[0] == CONSTANT_Long: - print 'Long\t\t' + str(const[1]) + print('Long\t\t' + str(const[1])) # elif const[0] == CONSTANT_NameAndType: - # print 'NameAndType\t\t FIXME!!!' + # print('NameAndType\t\t FIXME!!!') elif const[0] == CONSTANT_Utf8: - print 'Utf8\t\t' + str(const[1]) + print('Utf8\t\t' + str(const[1])) elif const[0] == CONSTANT_Class: - print 'Class\t\t' + str(c.constants[const[1]][1]) + print('Class\t\t' + str(c.constants[const[1]][1])) elif const[0] == CONSTANT_NameAndType: - print 'NameAndType\t\t' + str(const[1]) + '\t\t' + str(const[2]) + print('NameAndType\t\t' + str(const[1]) + '\t\t' + str(const[2])) else: - print 'Unknown(' + str(const[0]) + ')\t\t' + str(const[1]) + print('Unknown(' + str(const[0]) + ')\t\t' + str(const[1])) - - print 'Attributes: ' + print('Attributes: ') sys.stdout.write('Interfaces: ') @@ -564,25 +562,24 @@ def dumpClass(path): sys.stdout.write('Public ') if c.access & ACC_ABSTRACT: sys.stdout.write('Abstract ') - print ']' + print(']') - print 'Methods: ' + print('Methods: ') for meth in c.methods: - print ' ' + str(meth) + print(' ' + str(meth)) - print 'Class: ' + c.name + print('Class: ' + c.name) - print 'Super Class: ' + c.superClass + print('Super Class: ' + c.superClass) - print 'Interfaces: ', + print('Interfaces: ',) for inter in c.interfaces: - print inter + ", ", - + print(inter + ", ",) if __name__ == '__main__': if len(sys.argv) < 2: - print 'Usage %s: [b.class] ...' % (sys.argv[0]) + print('Usage %s: [b.class] ...' % (sys.argv[0])) sys.exit(-1) for x in sys.argv[1:]: diff --git a/binary-analysis/scancode-compiledcode/src/lkmclue/__init__.py b/binary-analysis/scancode-compiledcode/src/lkmclue/__init__.py index ed8e0e3..83919b4 100644 --- a/binary-analysis/scancode-compiledcode/src/lkmclue/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/lkmclue/__init__.py @@ -22,10 +22,6 @@ # ScanCode is a free software code scanning tool from nexB Inc. and others. # Visit https://github.com/nexB/scancode-toolkit/ for support and download. -from __future__ import absolute_import -from __future__ import unicode_literals - -from collections import OrderedDict from functools import partial from itertools import chain @@ -46,8 +42,8 @@ class LKMClueScanner(ScanPlugin): """ Scan lkm-clue information from the resource. """ - resource_attributes = OrderedDict( - lkm_clue=attr.ib(default=attr.Factory(OrderedDict), repr=False), + resource_attributes = dict( + lkm_clue=attr.ib(default=attr.Factory(dict), repr=False), ) options = [ @@ -71,7 +67,7 @@ def get_lkm_clues(location, **kwargs): key: lkm_clue_type and value: list of lkm_clue """ - clues = OrderedDict() + clues = dict() for type, clue in kernel.find_lkms(location): if not type or not clue: continue @@ -79,6 +75,6 @@ def get_lkm_clues(location, **kwargs): clues[type] = clues.get(type).append(clue) else: clues[type] = [clue] - return OrderedDict( + return dict( lkm_clue=clues, ) diff --git a/binary-analysis/scancode-compiledcode/src/makedepend/__init__.py b/binary-analysis/scancode-compiledcode/src/makedepend/__init__.py index b174fd3..aa91815 100644 --- a/binary-analysis/scancode-compiledcode/src/makedepend/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/makedepend/__init__.py @@ -26,7 +26,6 @@ from __future__ import absolute_import from __future__ import unicode_literals -from collections import OrderedDict from functools import partial from itertools import chain @@ -45,8 +44,8 @@ class MakeDependScanner(ScanPlugin): """ Parse generated make depend files to find sources corresponding binaries. """ - resource_attributes = OrderedDict( - makedepend=attr.ib(default=attr.Factory(OrderedDict), repr=False), + resource_attributes = dict( + makedepend=attr.ib(default=attr.Factory(dict), repr=False), ) options = [ @@ -129,7 +128,7 @@ def makedepend_scan(location, **kwargs): for p in line.split(): src_paths.append(p) if obj_path and src_paths: - makedepend_result = OrderedDict() + makedepend_result = dict() makedepend_result[obj_path] = src_paths - return OrderedDict(makedepend=makedepend_result) + return dict(makedepend=makedepend_result) diff --git a/binary-analysis/scancode-compiledcode/src/sourcecode/__init__.py b/binary-analysis/scancode-compiledcode/src/sourcecode/__init__.py index ef6f146..bfe7aa2 100644 --- a/binary-analysis/scancode-compiledcode/src/sourcecode/__init__.py +++ b/binary-analysis/scancode-compiledcode/src/sourcecode/__init__.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import unicode_literals -from collections import OrderedDict from functools import partial from itertools import chain @@ -47,7 +46,7 @@ class CodeCommentLinesScanner(ScanPlugin): """ Scan the number of lines of code and lines of the comments. """ - resource_attributes = OrderedDict( + resource_attributes = dict( codelines=attr.ib(default=attr.Factory(int), repr=False), commentlines=attr.ib(default=attr.Factory(int), repr=False), @@ -76,7 +75,7 @@ def get_codecommentlines(location, **kwargs): codelines = 0 commentlines = 0 codelines, commentlines = file_lines_count(location) - return OrderedDict( + return dict( codelines=codelines, commentlines=commentlines ) diff --git a/binary-analysis/scancode-compiledcode/tests/test_cpp_includes.py b/binary-analysis/scancode-compiledcode/tests/test_cpp_includes.py index 4cf1aa4..cf76667 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_cpp_includes.py +++ b/binary-analysis/scancode-compiledcode/tests/test_cpp_includes.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/binary-analysis/scancode-compiledcode/tests/test_dwarf.py b/binary-analysis/scancode-compiledcode/tests/test_dwarf.py index d1098c6..6622c67 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_dwarf.py +++ b/binary-analysis/scancode-compiledcode/tests/test_dwarf.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os @@ -73,7 +72,7 @@ def check_dwarf(self, test_file, expected_file, regen=False): json.dump(result, exc, indent=2, encoding='utf-8') with open(expected_file, 'rb') as exc: - expected = json.load(exc, encoding='utf-8', object_pairs_hook=OrderedDict) + expected = json.load(exc, encoding='utf-8', object_pairs_hook=dict) assert sorted(expected['original_source_files']) == sorted(result['original_source_files']) assert sorted(expected['included_source_files']) == sorted(result['included_source_files']) diff --git a/binary-analysis/scancode-compiledcode/tests/test_dwarf2.py b/binary-analysis/scancode-compiledcode/tests/test_dwarf2.py index 8ad07ba..f65b013 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_dwarf2.py +++ b/binary-analysis/scancode-compiledcode/tests/test_dwarf2.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os from unittest.case import skipIf @@ -88,7 +87,7 @@ def check_dwarf(self, test_file, expected_file, regen=False): json.dump(result, exc, indent=2, encoding='utf-8') with open(expected_loc, 'rb') as exc: - expected = json.load(exc, encoding='utf-8', object_pairs_hook=OrderedDict) + expected = json.load(exc, encoding='utf-8', object_pairs_hook=dict) assert sorted(expected) == sorted(result) diff --git a/binary-analysis/scancode-compiledcode/tests/test_dwarf3.py b/binary-analysis/scancode-compiledcode/tests/test_dwarf3.py index bb43fd3..0f9e0d0 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_dwarf3.py +++ b/binary-analysis/scancode-compiledcode/tests/test_dwarf3.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os from unittest.case import skipIf @@ -55,7 +54,7 @@ def check_dwarf3(self, test_file, expected_file, regen=False): json.dump(result, exc, indent=2, encoding='utf-8') with open(expected_loc, 'rb') as exc: - expected = json.load(exc, encoding='utf-8', object_pairs_hook=OrderedDict) + expected = json.load(exc, encoding='utf-8', object_pairs_hook=dict) assert sorted(expected) == sorted(result) diff --git a/binary-analysis/scancode-compiledcode/tests/test_elf.py b/binary-analysis/scancode-compiledcode/tests/test_elf.py index ce402e3..91d107e 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_elf.py +++ b/binary-analysis/scancode-compiledcode/tests/test_elf.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/binary-analysis/scancode-compiledcode/tests/test_generatedcode.py b/binary-analysis/scancode-compiledcode/tests/test_generatedcode.py index f1979f8..757b943 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_generatedcode.py +++ b/binary-analysis/scancode-compiledcode/tests/test_generatedcode.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/binary-analysis/scancode-compiledcode/tests/test_gwt.py b/binary-analysis/scancode-compiledcode/tests/test_gwt.py index cb97339..724ebba 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_gwt.py +++ b/binary-analysis/scancode-compiledcode/tests/test_gwt.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/binary-analysis/scancode-compiledcode/tests/test_javaclass.py b/binary-analysis/scancode-compiledcode/tests/test_javaclass.py index 76b6938..9c00f88 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_javaclass.py +++ b/binary-analysis/scancode-compiledcode/tests/test_javaclass.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/binary-analysis/scancode-compiledcode/tests/test_lkmclue.py b/binary-analysis/scancode-compiledcode/tests/test_lkmclue.py index 28ec9be..906b1bd 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_lkmclue.py +++ b/binary-analysis/scancode-compiledcode/tests/test_lkmclue.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/binary-analysis/scancode-compiledcode/tests/test_makedepend.py b/binary-analysis/scancode-compiledcode/tests/test_makedepend.py index 4bcae6c..0b9cce2 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_makedepend.py +++ b/binary-analysis/scancode-compiledcode/tests/test_makedepend.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/binary-analysis/scancode-compiledcode/tests/test_sourcecode.py b/binary-analysis/scancode-compiledcode/tests/test_sourcecode.py index 0f65015..e975fb0 100644 --- a/binary-analysis/scancode-compiledcode/tests/test_sourcecode.py +++ b/binary-analysis/scancode-compiledcode/tests/test_sourcecode.py @@ -25,7 +25,6 @@ from __future__ import absolute_import from __future__ import print_function -from collections import OrderedDict import json import os diff --git a/builtins/extractcode_7z-linux/setup.cfg b/builtins/extractcode_7z-linux/setup.cfg index a3b4802..2c141df 100755 --- a/builtins/extractcode_7z-linux/setup.cfg +++ b/builtins/extractcode_7z-linux/setup.cfg @@ -5,4 +5,4 @@ license_files = apache-2.0.LICENSE [aliases] -release = clean --all bdist_wheel --plat-name manylinux2014_x86_64 --python-tag py3 +release = clean --all bdist_wheel --plat-name manylinux1_x86_64 --python-tag py3 diff --git a/builtins/extractcode_7z-linux/src/extractcode_7z/__init__.py b/builtins/extractcode_7z-linux/src/extractcode_7z/__init__.py index 754a067..c843085 100755 --- a/builtins/extractcode_7z-linux/src/extractcode_7z/__init__.py +++ b/builtins/extractcode_7z-linux/src/extractcode_7z/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # diff --git a/builtins/extractcode_7z-macosx/src/extractcode_7z/__init__.py b/builtins/extractcode_7z-macosx/src/extractcode_7z/__init__.py index 7df69b5..bc17e98 100755 --- a/builtins/extractcode_7z-macosx/src/extractcode_7z/__init__.py +++ b/builtins/extractcode_7z-macosx/src/extractcode_7z/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # from os.path import abspath diff --git a/builtins/extractcode_7z-win64/src/extractcode_7z/__init__.py b/builtins/extractcode_7z-win64/src/extractcode_7z/__init__.py index c83b85e..5aaabff 100755 --- a/builtins/extractcode_7z-win64/src/extractcode_7z/__init__.py +++ b/builtins/extractcode_7z-win64/src/extractcode_7z/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # from os.path import abspath diff --git a/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py b/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py index 00e49e0..74eb8de 100755 --- a/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py +++ b/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # diff --git a/builtins/extractcode_libarchive-linux/setup.cfg b/builtins/extractcode_libarchive-linux/setup.cfg index a3b4802..2c141df 100755 --- a/builtins/extractcode_libarchive-linux/setup.cfg +++ b/builtins/extractcode_libarchive-linux/setup.cfg @@ -5,4 +5,4 @@ license_files = apache-2.0.LICENSE [aliases] -release = clean --all bdist_wheel --plat-name manylinux2014_x86_64 --python-tag py3 +release = clean --all bdist_wheel --plat-name manylinux1_x86_64 --python-tag py3 diff --git a/builtins/extractcode_libarchive-linux/src/extractcode_libarchive/__init__.py b/builtins/extractcode_libarchive-linux/src/extractcode_libarchive/__init__.py index 9e43deb..0280701 100755 --- a/builtins/extractcode_libarchive-linux/src/extractcode_libarchive/__init__.py +++ b/builtins/extractcode_libarchive-linux/src/extractcode_libarchive/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # from os.path import abspath diff --git a/builtins/extractcode_libarchive-macosx/src/extractcode_libarchive/__init__.py b/builtins/extractcode_libarchive-macosx/src/extractcode_libarchive/__init__.py index 25524cc..68d37ba 100755 --- a/builtins/extractcode_libarchive-macosx/src/extractcode_libarchive/__init__.py +++ b/builtins/extractcode_libarchive-macosx/src/extractcode_libarchive/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # from os.path import abspath diff --git a/builtins/extractcode_libarchive-win64/src/extractcode_libarchive/__init__.py b/builtins/extractcode_libarchive-win64/src/extractcode_libarchive/__init__.py index c806d7e..4829257 100755 --- a/builtins/extractcode_libarchive-win64/src/extractcode_libarchive/__init__.py +++ b/builtins/extractcode_libarchive-win64/src/extractcode_libarchive/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # from os.path import abspath diff --git a/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py b/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py index bcf33a1..9496daa 100755 --- a/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py +++ b/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # from os import path diff --git a/builtins/rpm_inspector_rpm/README.rst b/builtins/rpm_inspector_rpm/README.rst index a9b9b88..9f910b2 100755 --- a/builtins/rpm_inspector_rpm/README.rst +++ b/builtins/rpm_inspector_rpm/README.rst @@ -1,2 +1,3 @@ -A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations. -This is for RPM which is built from sources with the support for many rpmdb formats. \ No newline at end of file +A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities +and their locations. This is for the RPM command which is built from sources +with the support for many rpmdb formats. diff --git a/builtins/rpm_inspector_rpm/build.sh b/builtins/rpm_inspector_rpm/build.sh index 51c5980..8060965 100755 --- a/builtins/rpm_inspector_rpm/build.sh +++ b/builtins/rpm_inspector_rpm/build.sh @@ -4,7 +4,11 @@ # set -e -base_name=rpm-rpm-4.16.1.2-release + +base_name=rpm-rpm-4.16.1.3 +so_version=9.1.3 + + cd lib-src/ rm -rf $base_name @@ -30,8 +34,8 @@ echo Build RPM make cp .libs/rpm ../../src/rpm_inspector_rpm/bin/ cp .libs/rpmdb ../../src/rpm_inspector_rpm/bin/ -cp lib/.libs/librpm.so.9.1.2 ../../src/rpm_inspector_rpm/bin/librpm.so.9 -cp rpmio/.libs/librpmio.so.9.1.2 ../../src/rpm_inspector_rpm/bin/librpmio.so.9 +cp lib/.libs/librpm.so.$so_version ../../src/rpm_inspector_rpm/bin/librpm.so.9 +cp rpmio/.libs/librpmio.so.$so_version ../../src/rpm_inspector_rpm/bin/librpmio.so.9 strip \ ../../src/rpm_inspector_rpm/bin/librpmio.so.9 \ ../../src/rpm_inspector_rpm/bin/librpm.so.9 \ @@ -40,5 +44,5 @@ strip \ cd ../.. echo Done building RPM -#rm -rf $base_name/ +rm -rf $base_name/ diff --git a/builtins/rpm_inspector_rpm/lib-src/.gitignore b/builtins/rpm_inspector_rpm/lib-src/.gitignore index fd8c11f..0b1a103 100644 --- a/builtins/rpm_inspector_rpm/lib-src/.gitignore +++ b/builtins/rpm_inspector_rpm/lib-src/.gitignore @@ -1 +1 @@ -/rpm-rpm-4.16.1.2-release/ +/rpm-rpm-4.16.1.3/ diff --git a/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz b/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz deleted file mode 100644 index c9dee9b..0000000 Binary files a/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz and /dev/null differ diff --git a/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz b/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz new file mode 100644 index 0000000..4fa76a1 Binary files /dev/null and b/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz differ diff --git a/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz.ABOUT b/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz.ABOUT similarity index 60% rename from builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz.ABOUT rename to builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz.ABOUT index de52d7d..b3f8d29 100755 --- a/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz.ABOUT +++ b/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz.ABOUT @@ -1,9 +1,9 @@ -about_resource: rpm-rpm-4.16.1.2-release.tar.gz -version: 4.16.1.2 +about_resource: rpm-rpm-4.16.1.3.tar.gz +version: 4.16.1.3 homepage_url: https://github.com/rpm-software-management/rpm name: rpm owner: RPM authors -download_url: https://github.com/rpm-software-management/rpm/archive/rpm-4.16.1.2-release.tar.gz +download_url: https://github.com/rpm-software-management/rpm/archive/refs/tags/rpm-4.16.1.3.tar.gz copyright: Copyright (c) RPM authors license_expression: gpl-2.0 AND lgpl-2.0 -notice_file: rpm-rpm-4.16.1.2-release.tar.gz.NOTICE +notice_file: rpm-rpm-4.16.1.3-release.tar.gz.NOTICE diff --git a/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz.NOTICE b/builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz.NOTICE similarity index 100% rename from builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.2-release.tar.gz.NOTICE rename to builtins/rpm_inspector_rpm/lib-src/rpm-rpm-4.16.1.3.tar.gz.NOTICE diff --git a/builtins/rpm_inspector_rpm/rpm.ABOUT b/builtins/rpm_inspector_rpm/rpm.ABOUT index 359713d..61d1633 100755 --- a/builtins/rpm_inspector_rpm/rpm.ABOUT +++ b/builtins/rpm_inspector_rpm/rpm.ABOUT @@ -1,9 +1,9 @@ about_resource: . -version: 4.16.1.2 +version: 4.16.1.3 homepage_url: https://github.com/rpm-software-management/rpm name: rpm owner: RPM authors -download_url: https://github.com/rpm-software-management/rpm/archive/rpm-4.16.1.2-release.tar.gz +download_url: https://github.com/rpm-software-management/rpm/archive/refs/tags/rpm-4.16.1.3.tar.gz copyright: Copyright (c) RPM authors license_expression: gpl-2.0 AND lgpl-2.0 notice_file: pdf2text.NOTICE diff --git a/builtins/rpm_inspector_rpm/setup.cfg b/builtins/rpm_inspector_rpm/setup.cfg index 55ce8ed..aef4e16 100755 --- a/builtins/rpm_inspector_rpm/setup.cfg +++ b/builtins/rpm_inspector_rpm/setup.cfg @@ -9,4 +9,4 @@ license_files = rpm-inspector-rpm.ABOUT [aliases] -release = clean --all bdist_wheel --plat-name manylinux2014_x86_64 --python-tag py3 +release = clean --all bdist_wheel --plat-name manylinux1_x86_64 --python-tag py3 diff --git a/builtins/rpm_inspector_rpm/setup.py b/builtins/rpm_inspector_rpm/setup.py index 24d48d0..740721a 100755 --- a/builtins/rpm_inspector_rpm/setup.py +++ b/builtins/rpm_inspector_rpm/setup.py @@ -45,7 +45,7 @@ def run(self): setup( name='rpm-inspector-rpm', - version='4.16.1.2.210223', + version='4.16.1.3.210330', license=' apache-2.0 AND (gpl-2.0 AND lgpl-2.0)', description=desc, long_description=desc, @@ -64,7 +64,7 @@ def run(self): 'Topic :: Utilities', ], keywords=[ - 'open source', 'packagedcode', 'scancode', 'rpm', 'rpmdb' + 'open source', 'packagedcode', 'scancode', 'rpm', 'rpmdb', ], install_requires=[ 'plugincode', diff --git a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/__init__.py b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/__init__.py index 06c751b..afee0f1 100755 --- a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/__init__.py +++ b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # @@ -33,6 +22,5 @@ def get_locations(self): bin_dir = join(curr_dir, 'bin') locations = { 'rpm_inspector_rpm.rpm.bindir': bin_dir, - 'rpm_inspector_rpm.rpm.exe': join(bin_dir, 'rpmdb'), } return locations diff --git a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpm.so.9 b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpm.so.9 index 7f6c337..2123e6b 100755 Binary files a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpm.so.9 and b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpm.so.9 differ diff --git a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpmio.so.9 b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpmio.so.9 index 8fe1f60..a2e7c3e 100755 Binary files a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpmio.so.9 and b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/librpmio.so.9 differ diff --git a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpm b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpm index c9c7503..b060398 100755 Binary files a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpm and b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpm differ diff --git a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpmdb b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpmdb index 9334297..ef95fc3 100755 Binary files a/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpmdb and b/builtins/rpm_inspector_rpm/src/rpm_inspector_rpm/bin/rpmdb differ diff --git a/builtins/textcode_pdf2text-linux/setup.cfg b/builtins/textcode_pdf2text-linux/setup.cfg index b1e6411..db7f77d 100755 --- a/builtins/textcode_pdf2text-linux/setup.cfg +++ b/builtins/textcode_pdf2text-linux/setup.cfg @@ -9,4 +9,4 @@ license_files = textcode-pdf2text.ABOUT [aliases] -release = clean --all bdist_wheel --plat-name manylinux2014_x86_64 --python-tag py3 +release = clean --all bdist_wheel --plat-name manylinux1_x86_64 --python-tag py3 diff --git a/builtins/textcode_pdf2text-linux/src/textcode_pdf2text/__init__.py b/builtins/textcode_pdf2text-linux/src/textcode_pdf2text/__init__.py index eb143c5..d87f280 100755 --- a/builtins/textcode_pdf2text-linux/src/textcode_pdf2text/__init__.py +++ b/builtins/textcode_pdf2text-linux/src/textcode_pdf2text/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # diff --git a/builtins/textcode_pdf2text-macosx/src/textcode_pdf2text/__init__.py b/builtins/textcode_pdf2text-macosx/src/textcode_pdf2text/__init__.py index eb143c5..d87f280 100755 --- a/builtins/textcode_pdf2text-macosx/src/textcode_pdf2text/__init__.py +++ b/builtins/textcode_pdf2text-macosx/src/textcode_pdf2text/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # diff --git a/builtins/textcode_pdf2text-win64/src/textcode_pdf2text/__init__.py b/builtins/textcode_pdf2text-win64/src/textcode_pdf2text/__init__.py index 302c9ff..e02fcea 100755 --- a/builtins/textcode_pdf2text-win64/src/textcode_pdf2text/__init__.py +++ b/builtins/textcode_pdf2text-win64/src/textcode_pdf2text/__init__.py @@ -1,21 +1,10 @@ # -# Copyright (c) nexB Inc. and others. -# SPDX-License-Identifier: Apache-2.0 -# -# Visit https://aboutcode.org and https://github.com/nexB/ for support and download. +# Copyright (c) nexB Inc. and others. All rights reserved. # ScanCode is a trademark of nexB Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# See http://www.apache.org/licenses/LICENSE-2.0 for the license text. +# See https://github.com/nexB/scancode-toolkit for support or download. +# See https://aboutcode.org for more information about nexB OSS projects. # diff --git a/builtins/typecode_libmagic-linux/setup.cfg b/builtins/typecode_libmagic-linux/setup.cfg index bbaf3b9..ad5f598 100755 --- a/builtins/typecode_libmagic-linux/setup.cfg +++ b/builtins/typecode_libmagic-linux/setup.cfg @@ -14,4 +14,4 @@ license_files = typecode-libmagic.ABOUT [aliases] -release = clean --all bdist_wheel --plat-name manylinux2014_x86_64 --python-tag py3 +release = clean --all bdist_wheel --plat-name manylinux1_x86_64 --python-tag py3 diff --git a/requirements.txt b/requirements.txt index 707c5e3..b6071f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,12 +12,12 @@ pluggy==0.13.1 py==1.10.0 pyparsing==2.4.7 pytest==6.2.1 -PyYAML==5.3.1 +PyYAML==5.4.1 requests==2.25.1 saneyaml==0.4 setuptools==51.3.3 toml==0.10.2 typing-extensions==3.7.4.3 -urllib3==1.26.2 +urllib3==1.26.4 wheel==0.36.2 zipp==3.4.0