Skip to content

Commit

Permalink
Merge pull request buildtesters#1545 from buildtesters/pyproject.toml
Browse files Browse the repository at this point in the history
Add pyproject.toml file
  • Loading branch information
shahzebsiddiqui committed Jul 12, 2023
2 parents dcdc15a + b730a97 commit 4e6dfae
Show file tree
Hide file tree
Showing 64 changed files with 228 additions and 314 deletions.
44 changes: 0 additions & 44 deletions .coveragerc

This file was deleted.

9 changes: 0 additions & 9 deletions .isort.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
args: ["--profile", "black", "--filter-files", "buildtest", "tests", "docs"]

- repo: https://github.com/psf/black
rev: 23.3.0
rev: 'refs/tags/22.3.0'
hooks:
- id: black
language_version: python3
Expand Down
3 changes: 1 addition & 2 deletions buildtest/builders/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,7 @@ def _write_test(self):
self._set_execute_perm(self.testpath)
# copy testpath to run_dir
shutil.copy2(
self.testpath,
os.path.join(self.test_root, os.path.basename(self.testpath)),
self.testpath, os.path.join(self.test_root, os.path.basename(self.testpath))
)

def _emit_command(self):
Expand Down
59 changes: 19 additions & 40 deletions buildtest/buildsystem/checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ def returncode_check(builder):
logger.debug("Conducting Return Code check")
logger.debug(
"Status Return Code: %s Result Return Code: %s"
% (
buildspec_returncode,
builder.metadata["result"]["returncode"],
)
% (buildspec_returncode, builder.metadata["result"]["returncode"])
)
# checks if test returncode matches returncode specified in Buildspec and assign boolean to returncode_match
returncode_match = builder.metadata["result"]["returncode"] in buildspec_returncode
Expand Down Expand Up @@ -389,12 +386,10 @@ def assert_ge_check(builder):

# convert metric value and reference value to int
conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)
ref_value = convert_metrics(
metric_value=ref_value,
dtype=builder.metrics[name]["type"],
metric_value=ref_value, dtype=builder.metrics[name]["type"]
)

# if there is a type mismatch then let's stop now before we do comparison
Expand Down Expand Up @@ -460,12 +455,10 @@ def assert_le_check(builder):

# convert metric value and reference value to int
conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)
ref_value = convert_metrics(
metric_value=ref_value,
dtype=builder.metrics[name]["type"],
metric_value=ref_value, dtype=builder.metrics[name]["type"]
)

# if there is a type mismatch then let's stop now before we do comparison
Expand Down Expand Up @@ -531,12 +524,10 @@ def assert_gt_check(builder):

# convert metric value and reference value to int
conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)
ref_value = convert_metrics(
metric_value=ref_value,
dtype=builder.metrics[name]["type"],
metric_value=ref_value, dtype=builder.metrics[name]["type"]
)

# if there is a type mismatch then let's stop now before we do comparison
Expand Down Expand Up @@ -602,12 +593,10 @@ def assert_lt_check(builder):

# convert metric value and reference value to int
conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)
ref_value = convert_metrics(
metric_value=ref_value,
dtype=builder.metrics[name]["type"],
metric_value=ref_value, dtype=builder.metrics[name]["type"]
)

# if there is a type mismatch then let's stop now before we do comparison
Expand Down Expand Up @@ -665,12 +654,10 @@ def assert_eq_check(builder):
continue

conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)
ref_value = convert_metrics(
metric_value=ref_value,
dtype=builder.metrics[name]["type"],
metric_value=ref_value, dtype=builder.metrics[name]["type"]
)

# if either converted value and reference value is None stop here before proceeding to equality check
Expand Down Expand Up @@ -728,12 +715,10 @@ def assert_ne_check(builder):
continue

conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)
ref_value = convert_metrics(
metric_value=ref_value,
dtype=builder.metrics[name]["type"],
metric_value=ref_value, dtype=builder.metrics[name]["type"]
)

# if either converted value and reference value is None stop here before proceeding to the not equal check
Expand Down Expand Up @@ -791,8 +776,7 @@ def contains_check(builder):
continue

conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)

# if either converted value and reference value is None stop here before proceeding to the not equal check
Expand Down Expand Up @@ -854,8 +838,7 @@ def notcontains_check(builder):
continue

conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)

# if either converted value and reference value is None stop here before proceeding to the not equal check
Expand Down Expand Up @@ -926,20 +909,16 @@ def assert_range_check(builder):
continue

conv_value = convert_metrics(
metric_value=metric_value,
dtype=builder.metrics[name]["type"],
metric_value=metric_value, dtype=builder.metrics[name]["type"]
)
lower_bound = convert_metrics(
metric_value=lower_bound,
dtype=builder.metrics[name]["type"],
metric_value=lower_bound, dtype=builder.metrics[name]["type"]
)
lower_bound = convert_metrics(
metric_value=lower_bound,
dtype=builder.metrics[name]["type"],
metric_value=lower_bound, dtype=builder.metrics[name]["type"]
)
upper_bound = convert_metrics(
metric_value=upper_bound,
dtype=builder.metrics[name]["type"],
metric_value=upper_bound, dtype=builder.metrics[name]["type"]
)

# if any item is None we stop before we run comparison
Expand Down
4 changes: 1 addition & 3 deletions buildtest/buildsystem/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@ def _check_schema_type(self, test):
msg = f"Schema type must be one of the following: {schema_table['types']}. "
raise InvalidBuildspecSchemaType(self.buildspec, msg)

self.logger.info(
f"Test: '{test}' is using schema type: '{self.schema_type}'",
)
self.logger.info(f"Test: '{test}' is using schema type: '{self.schema_type}'")

def _check_executor(self, test):
"""This method checks if ``executor`` property is not None and executor
Expand Down
Loading

0 comments on commit 4e6dfae

Please sign in to comment.