From c11c64f557410ec21a2a717381928670a244d21d Mon Sep 17 00:00:00 2001 From: Reid 'arrdem' McKenzie Date: Sat, 19 Nov 2022 23:52:38 -0700 Subject: [PATCH] Tweaks --- zapp/__main__.py | 2 -- zapp/compiler/__main__.py | 3 --- zapp/zapp.bzl | 4 ---- 3 files changed, 9 deletions(-) diff --git a/zapp/__main__.py b/zapp/__main__.py index db6db1b..7a5c708 100644 --- a/zapp/__main__.py +++ b/zapp/__main__.py @@ -3,12 +3,10 @@ The Zapp compiler. """ import argparse -import io import json import os import pathlib import stat -import sys import zipfile parser = argparse.ArgumentParser(description="The (bootstrap) Zapp compiler") diff --git a/zapp/compiler/__main__.py b/zapp/compiler/__main__.py index 19dfb0e..b1596b2 100644 --- a/zapp/compiler/__main__.py +++ b/zapp/compiler/__main__.py @@ -3,19 +3,16 @@ The Zapp! compiler. """ import argparse -import io import json import os import pathlib import stat import sys import zipfile -from collections import defaultdict from email.parser import Parser from itertools import chain from pathlib import Path from pprint import pprint -from shutil import move from tempfile import TemporaryDirectory from zapp.support.pep425 import compress_tags, decompress_tag diff --git a/zapp/zapp.bzl b/zapp/zapp.bzl index 6ee0160..85f7679 100644 --- a/zapp/zapp.bzl +++ b/zapp/zapp.bzl @@ -105,9 +105,6 @@ def _zapp_impl(ctx): stored_path = _store_path(input_file.short_path, ctx, import_roots) if stored_path: local_path = input_file.path - conflicts = [e for e in sources_map if e[0] == stored_path] - if conflicts: - print("File %s conflicts with others, %s" % (input_file, conflicts)) sources_map.append([stored_path, local_path]) _check_script(main_py_ref, sources_map) @@ -154,7 +151,6 @@ def _zapp_impl(ctx): progress_message = "Building zapp file %s" % ctx.label, executable = ctx.executable.compiler, arguments = [ - "--debug", "-o", ctx.outputs.executable.path, manifest_file.path ],