Skip to content

Drop support for Python 3.7 and Pyspark 2.x and remove vendored dependency on six #80

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.

Sign up for GitHub

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 3 commits into from
Jul 16, 2024
Merged

Drop support for Python 3.7 and Pyspark 2.x and remove vendored dependency on six #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b7d453
remove dependency on six, drop support for python 3.7, update dev dep…
fpgmaas Oct 18, 2023
1458936
fix
fpgmaas Jul 14, 2024
c50cbe7
update pyspark to >3.0.0
fpgmaas Jul 14, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ chispa.egg-info/
tmp/
.idea/
.DS_Store
.python_version

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
1 change: 0 additions & 1 deletion .python-version
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,6 @@ TODO: Need to benchmark these methods vs. the spark-testing-base ones

## Vendored dependencies

These dependencies are vendored:

* [six](https://github.com/benjaminp/six)
* [PrettyTable](https://github.com/jazzband/prettytable)

The dependencies are vendored to save you from dependency hell.
Expand Down
11 changes: 6 additions & 5 deletions chispa/rows_comparer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import chispa.six as six
from itertools import zip_longest
from chispa.prettytable import PrettyTable
from chispa.bcolors import *
import chispa
Expand All @@ -11,8 +11,9 @@
def assert_basic_rows_equality(rows1, rows2, underline_cells=False, formats=DefaultFormats()):
if rows1 != rows2:
t = PrettyTable(["df1", "df2"])
zipped = list(six.moves.zip_longest(rows1, rows2))
zipped = list(zip_longest(rows1, rows2))
all_rows_equal = True

for r1, r2 in zipped:
if r1 is None and r2 is not None:
t.add_row([None, format_string(r2, formats.mismatched_rows)])
Expand All @@ -21,7 +22,7 @@ def assert_basic_rows_equality(rows1, rows2, underline_cells=False, formats=Defa
t.add_row([format_string(r1, formats.mismatched_rows), None])
all_rows_equal = False
else:
r_zipped = list(six.moves.zip_longest(r1.__fields__, r2.__fields__))
r_zipped = list(zip_longest(r1.__fields__, r2.__fields__))
r1_string = []
r2_string = []
for r1_field, r2_field in r_zipped:
Expand All @@ -43,7 +44,7 @@ def assert_basic_rows_equality(rows1, rows2, underline_cells=False, formats=Defa
def assert_generic_rows_equality(rows1, rows2, row_equality_fun, row_equality_fun_args, underline_cells=False, formats=DefaultFormats()):
df1_rows = rows1
df2_rows = rows2
zipped = list(six.moves.zip_longest(df1_rows, df2_rows))
zipped = list(zip_longest(df1_rows, df2_rows))
t = PrettyTable(["df1", "df2"])
all_rows_equal = True
for r1, r2 in zipped:
Expand All @@ -58,7 +59,7 @@ def assert_generic_rows_equality(rows1, rows2, row_equality_fun, row_equality_fu
t.add_row([format_string(r1_string, formats.matched_rows), format_string(r2_string, formats.matched_rows)])
# otherwise, rows aren't equal
else:
r_zipped = list(six.moves.zip_longest(r1.__fields__, r2.__fields__))
r_zipped = list(zip_longest(r1.__fields__, r2.__fields__))
r1_string = []
r2_string = []
for r1_field, r2_field in r_zipped:
Expand Down
12 changes: 6 additions & 6 deletions chispa/schema_comparer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from chispa.prettytable import PrettyTable
from chispa.bcolors import *
import chispa.six as six
from itertools import zip_longest


class SchemasNotEqualError(Exception):
Expand All @@ -19,15 +19,15 @@ def assert_schema_equality_full(s1, s2, ignore_nullable=False, ignore_metadata=F
def inner(s1, s2, ignore_nullable, ignore_metadata):
if len(s1) != len(s2):
return False
zipped = list(six.moves.zip_longest(s1, s2))
zipped = list(zip_longest(s1, s2))
for sf1, sf2 in zipped:
if not are_structfields_equal(sf1, sf2, ignore_nullable, ignore_metadata):
return False
return True

if not inner(s1, s2, ignore_nullable, ignore_metadata):
t = PrettyTable(["schema1", "schema2"])
zipped = list(six.moves.zip_longest(s1, s2))
zipped = list(zip_longest(s1, s2))
for sf1, sf2 in zipped:
if are_structfields_equal(sf1, sf2, True):
t.add_row([blue(sf1), blue(sf2)])
Expand All @@ -42,7 +42,7 @@ def inner(s1, s2, ignore_nullable, ignore_metadata):
def assert_basic_schema_equality(s1, s2):
if s1 != s2:
t = PrettyTable(["schema1", "schema2"])
zipped = list(six.moves.zip_longest(s1, s2))
zipped = list(zip_longest(s1, s2))
for sf1, sf2 in zipped:
if sf1 == sf2:
t.add_row([blue(sf1), blue(sf2)])
Expand All @@ -56,7 +56,7 @@ def assert_basic_schema_equality(s1, s2):
def assert_schema_equality_ignore_nullable(s1, s2):
if not are_schemas_equal_ignore_nullable(s1, s2):
t = PrettyTable(["schema1", "schema2"])
zipped = list(six.moves.zip_longest(s1, s2))
zipped = list(zip_longest(s1, s2))
for sf1, sf2 in zipped:
if are_structfields_equal(sf1, sf2, True):
t.add_row([blue(sf1), blue(sf2)])
Expand All @@ -69,7 +69,7 @@ def assert_schema_equality_ignore_nullable(s1, s2):
def are_schemas_equal_ignore_nullable(s1, s2):
if len(s1) != len(s2):
return False
zipped = list(six.moves.zip_longest(s1, s2))
zipped = list(zip_longest(s1, s2))
for sf1, sf2 in zipped:
if not are_structfields_equal(sf1, sf2, True):
return False
Expand Down
Loading