aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordeepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>2024-08-27 11:44:00 +0000
committerEllie <ecsymonds@gmail.com>2024-08-28 09:22:40 +0100
commitf8988db9372802053db60e311960f5da4defba02 (patch)
tree3664c4eed60797420c461a4e770e4afaa9177ff8 /tests
parent26902dc234c114382c2926923820c3537490c30e (diff)
downloadde-project-bentley-f8988db9372802053db60e311960f5da4defba02.tar.gz
de-project-bentley-f8988db9372802053db60e311960f5da4defba02.zip
style: format code with Autopep8, Black and Ruff Formatter
This commit fixes the style issues introduced in a05a371 according to the output from Autopep8, Black and Ruff Formatter. Details: https://github.com/ajschofield/de-project-bentley/pull/98
Diffstat (limited to 'tests')
-rw-r--r--tests/test_dataframes.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/test_dataframes.py b/tests/test_dataframes.py
index c9ff43f..cc133fe 100644
--- a/tests/test_dataframes.py
+++ b/tests/test_dataframes.py
@@ -252,6 +252,7 @@ class TestCreateFactPayment:
"payment": pd.DataFrame(
data=[
[
+<<<<<<< HEAD
dt.strptime(
"2022-11-03 14:20:49.962846", "%Y-%m-%d %H:%M:%S.%f"
),
@@ -261,6 +262,13 @@ class TestCreateFactPayment:
1,
"SE18 9QO",
"2020-07-16",
+=======
+ dt(2020, 5, 17, 6, 15, 20),
+ dt(2020, 5, 20, 8, 19, 30),
+ 1,
+ "SE18 9QO",
+ "2020-7-16",
+>>>>>>> 5db3f61 (style: format code with Autopep8, Black and Ruff Formatter)
]
],
columns=[
@@ -287,5 +295,10 @@ class TestCreateFactPayment:
for col in list(result.columns):
assert col in expected_cols
for col in expected_cols:
+<<<<<<< HEAD
if "_date" or "_time" in col:
assert result[col].dtype == "O"
+=======
+ if "date" in col:
+ assert result[col].dtype == "datetime64[ns]"
+>>>>>>> 5db3f61 (style: format code with Autopep8, Black and Ruff Formatter)
git.ajschof.me — hosted by ajschofield — powered by cgit