Unverified Commit 8520f0be authored by Francisco Massa's avatar Francisco Massa Committed by GitHub
Browse files

Miscellaneous linter fixes (#3095)

Replace tabs with spaces, add newlines to files and replace whitelist with allowlist
parent a0e5bbea
...@@ -212,6 +212,7 @@ if __name__ == "__main__": ...@@ -212,6 +212,7 @@ if __name__ == "__main__":
loader=jinja2.FileSystemLoader(d), loader=jinja2.FileSystemLoader(d),
lstrip_blocks=True, lstrip_blocks=True,
autoescape=False, autoescape=False,
keep_trailing_newline=True,
) )
with open(os.path.join(d, 'config.yml'), 'w') as f: with open(os.path.join(d, 'config.yml'), 'w') as f:
......
...@@ -21,7 +21,7 @@ if sys.platform == 'linux': ...@@ -21,7 +21,7 @@ if sys.platform == 'linux':
from wheel.bdist_wheel import get_abi_tag from wheel.bdist_wheel import get_abi_tag
WHITELIST = { ALLOWLIST = {
'libgcc_s.so.1', 'libstdc++.so.6', 'libm.so.6', 'libgcc_s.so.1', 'libstdc++.so.6', 'libm.so.6',
'libdl.so.2', 'librt.so.1', 'libc.so.6', 'libdl.so.2', 'librt.so.1', 'libc.so.6',
'libnsl.so.1', 'libutil.so.1', 'libpthread.so.0', 'libnsl.so.1', 'libutil.so.1', 'libpthread.so.0',
...@@ -31,7 +31,7 @@ WHITELIST = { ...@@ -31,7 +31,7 @@ WHITELIST = {
'libglib-2.0.so.0', 'ld-linux-x86-64.so.2', 'ld-2.17.so' 'libglib-2.0.so.0', 'ld-linux-x86-64.so.2', 'ld-2.17.so'
} }
WINDOWS_WHITELIST = { WINDOWS_ALLOWLIST = {
'MSVCP140.dll', 'KERNEL32.dll', 'MSVCP140.dll', 'KERNEL32.dll',
'VCRUNTIME140_1.dll', 'VCRUNTIME140.dll', 'VCRUNTIME140_1.dll', 'VCRUNTIME140.dll',
'api-ms-win-crt-heap-l1-1-0.dll', 'api-ms-win-crt-heap-l1-1-0.dll',
...@@ -164,7 +164,7 @@ def relocate_elf_library(patchelf, output_dir, output_library, binary): ...@@ -164,7 +164,7 @@ def relocate_elf_library(patchelf, output_dir, output_library, binary):
print('Omitting {0}'.format(library)) print('Omitting {0}'.format(library))
continue continue
if library in WHITELIST: if library in ALLOWLIST:
# Omit glibc/gcc/system libraries # Omit glibc/gcc/system libraries
print('Omitting {0}'.format(library)) print('Omitting {0}'.format(library))
continue continue
...@@ -275,7 +275,7 @@ def relocate_dll_library(dumpbin, output_dir, output_library, binary): ...@@ -275,7 +275,7 @@ def relocate_dll_library(dumpbin, output_dir, output_library, binary):
while binary_queue != []: while binary_queue != []:
library, parent = binary_queue.pop(0) library, parent = binary_queue.pop(0)
if library in WINDOWS_WHITELIST or library.startswith('api-ms-win'): if library in WINDOWS_ALLOWLIST or library.startswith('api-ms-win'):
print('Omitting {0}'.format(library)) print('Omitting {0}'.format(library))
continue continue
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment