From ff47aa2360e313a33fc5c700e01ea6911f05c75e Mon Sep 17 00:00:00 2001 From: mshukun Date: Fri, 8 Mar 2024 18:17:04 -0500 Subject: [PATCH] `flake8` and `black`. --- popsborder/app.py | 15 +++++++-------- popsborder/contamination.py | 8 +++++--- popsborder/inspections.py | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/popsborder/app.py b/popsborder/app.py index 56499105..26e8eaa8 100755 --- a/popsborder/app.py +++ b/popsborder/app.py @@ -72,12 +72,10 @@ def main(): ) basic = parser.add_argument_group("Simulation parameters (required)") basic.add_argument( - "--num-consignments", type=int, required=True, - help="Number of consignments" + "--num-consignments", type=int, required=True, help="Number of consignments" ) basic.add_argument( - "--config-file", type=str, required=True, - help="Path to configuration file" + "--config-file", type=str, required=True, help="Path to configuration file" ) optional = parser.add_argument_group("Running simulations (optional)") optional.add_argument( @@ -92,8 +90,7 @@ def main(): ) output_group = parser.add_argument_group("Output (optional)") output_group.add_argument( - "--output-file", type=str, required=False, - help="Path to output F280 csv file" + "--output-file", type=str, required=False, help="Path to output F280 csv file" ) pretty_choices = ( ("boxes", "Show boxes with individual items (default)"), @@ -106,8 +103,10 @@ def main(): const="boxes", # default behavior for pretty nargs="?", # value is optional choices=[i[0] for i in pretty_choices], - help=("Show pretty unicode output for each consignment\n" - + "\n".join(["\n ".join(i) for i in pretty_choices])), + help=( + "Show pretty unicode output for each consignment\n" + + "\n".join(["\n ".join(i) for i in pretty_choices]) + ), ) output_group.add_argument( "-v", diff --git a/popsborder/contamination.py b/popsborder/contamination.py index fbc31f67..a48d512f 100644 --- a/popsborder/contamination.py +++ b/popsborder/contamination.py @@ -239,9 +239,11 @@ def choose_strata_for_clusters(num_units, cluster_width, num_clusters): # Make sure there are enough strata for the number of clusters needed. if num_strata < num_clusters: raise ValueError( - ("Cannot avoid overlapping clusters. Increase " - "contaminated_units_per_cluster or decrease cluster_item_width (if using " - "item contamination_unit)") + ( + "Cannot avoid overlapping clusters. Increase " + "contaminated_units_per_cluster or decrease cluster_item_width (if " + "using item contamination_unit)" + ) ) # If all strata are needed, all strata are selected for clusters if num_clusters == num_strata: diff --git a/popsborder/inspections.py b/popsborder/inspections.py index 03cb19a1..494c1cb5 100644 --- a/popsborder/inspections.py +++ b/popsborder/inspections.py @@ -475,7 +475,7 @@ def inspect(config, consignment, n_units_to_inspect, detailed): inspect_per_box = sample_remainder # In each box, loop through first n items (n = inspect_per_box) for item_in_box_index, item in enumerate( - (consignment.boxes[box_index]).items[0:inspect_per_box] + (consignment.boxes[box_index]).items[0:inspect_per_box] ): if detailed: item_index = consignment.item_in_box_to_item_index( @@ -553,7 +553,7 @@ def inspect(config, consignment, n_units_to_inspect, detailed): ret.boxes_opened_detection += 1 # In each box, loop through first n items (n = inspect_per_box) for item_in_box_index, item in enumerate( - (consignment.boxes[box_index]).items[0:inspect_per_box] + (consignment.boxes[box_index]).items[0:inspect_per_box] ): if detailed: item_index = consignment.item_in_box_to_item_index(