Skip to content
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.

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

Remove unused six from setup.py #37

Merged
merged 1 commit into from
Apr 12, 2024

Conversation

jeffwidman
Copy link
Owner

This was removed from upstream code, but we forgot to update setup.py when we pulled that in.

This was removed from upstream code, but we forgot to update `setup.py` when we pulled that in.
@jeffwidman
Copy link
Owner Author

@bschoening IIRC you removed this from upstream right? So it's no longer an actual dep?

@jeffwidman
Copy link
Owner Author

As an aside, the whole setup.py file is no longer needed for GitHub's dep graph... they now parse newer python metadata files, but updating that is outside the scope of this PR.

@bschoening
Copy link
Collaborator

Yes, 'six' was removed in Apache Cassandra 4.1 (CASSANDRA-17417) and from the Python Driver in 3.29 datastax/python-driver#1172.

@jeffwidman
Copy link
Owner Author

@bschoening don't forget to approve the PR then 😁

@jeffwidman jeffwidman merged commit 59c30a4 into master Apr 12, 2024
@jeffwidman jeffwidman deleted the remove-unused-six-from-setup-py branch April 12, 2024 16:52
@jeffwidman
Copy link
Owner Author

jeffwidman commented Apr 12, 2024

Also @bschoening does that mean this line should no longer reference six?

third_parties = ('six-', 'pure_sasl-')

If so, then something to fix upstream not here, but just curious...

@bschoening
Copy link
Collaborator

bschoening commented Apr 12, 2024

Yes, that's the "ziploader" which is used with a tarball install of Cassandra where the driver and six are in the 'lib' directory. It shouldn't do anything when cqlsh is 'pip' installed. The use of 'six' there has been removed in Cassandra 5.0.

Six was used both by CQLSH in Apache Cassandra and in the DataStax Python driver. DataStax lagged quite a bit on removing the use and dependency on Six, and thus the zip loader still uses it in 4.1.x with the bundled driver version 3.25.

cqlsh 4.1 with Python driver version 3.29 - if you use the 'pip' installed cqlsh, you do not need six.
cqlsh 4.1 with Python driver version 3.28 or earlier - pip should have installed the 'six' requirement specified in https://github.com/datastax/python-driver/blob/3.28.0/requirements.txt.

It's been a two year+ journey to remove the last bits of Python 2.7 compatibility.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants