Skip to content

Revert "Integrate python-lint into validation tests" #8247

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

Merged
merged 1 commit into from
Mar 21, 2017
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
4 changes: 1 addition & 3 deletions utils/python-lint
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@ def main():
if flake8_result != 0:
print("Missing modules flake8 or flake8-import-order. Please be sure "
"to install these python packages before linting.")
sys.exit(0)

utils_directory = os.path.dirname(os.path.abspath(__file__))
parent_directory = os.path.dirname(utils_directory)
linting_result = subprocess.call(
subprocess.call(
[sys.executable, "-m", "flake8"] + sys.argv[1:],
cwd=parent_directory,
universal_newlines=True
)
sys.exit(linting_result)


if __name__ == '__main__':
Expand Down
6 changes: 2 additions & 4 deletions utils/swift_build_support/tests/test_workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def test_workspace(self):

class ComputeBuildSubdirTestCase(unittest.TestCase):

def create_basic_args(self, generator, variant, assertions,
enable_asan=False):
def create_basic_args(self, generator, variant, assertions, enable_asan=False):
return argparse.Namespace(
cmake_generator=generator,
cmark_build_variant=variant,
Expand Down Expand Up @@ -140,8 +139,7 @@ def test_all_combinations_are_unique(self):

def generate():
for c in productions:
args = argparse.Namespace(cmake_generator="Ninja",
enable_asan=False)
args = argparse.Namespace(cmake_generator="Ninja", enable_asan=False)
for key, val in zip(keys, c):
setattr(args, key, val)
yield compute_build_subdir(args)
Expand Down
1 change: 0 additions & 1 deletion validation-test/Python/python-lint.swift

This file was deleted.