Skip to content

Remove outdated Python pre-3.7 references #1186

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
absurdfarce merged 3 commits into from
Nov 13, 2023
Merged

Remove outdated Python pre-3.7 references #1186

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
88a611e
Removed backup(.bak) files
bschoening Nov 6, 2023
688c2a4
remove outdated <= 3.6 references
bschoening Nov 6, 2023
6d51d32
Merge branch 'datastax:master' into master
bschoening Nov 6, 2023
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
2 changes: 1 addition & 1 deletion README-dev.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Use tee to capture logs and see them on your terminal::

Testing Multiple Python Versions
--------------------------------
If you want to test all of python 2.7, 3.5, 3.6, 3.7, and pypy, use tox (this is what
If you want to test all of python 3.7, 3.8, and pypy, use tox (this is what
Copy link
Contributor

@absurdfarce absurdfarce Nov 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find! I must've missed this one when I put out the last release 🤦

TravisCI runs)::

tox
Expand Down
7 changes: 2 additions & 5 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ ccm>=2.1.2
pytz
sure
pure-sasl
twisted[tls]; python_version >= '3.5'
twisted[tls]==19.2.1; python_version < '3.5'
twisted[tls]
gevent>=1.0
eventlet
cython>=0.20,<0.30
packaging
backports.ssl_match_hostname; python_version < '2.7.9'
futurist; python_version >= '3.7'
asynctest; python_version >= '3.5'
ipaddress; python_version < '3.3.0'
asynctest
2 changes: 1 addition & 1 deletion tests/integration/long/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

if not hasattr(ssl, 'match_hostname'):
try:
from backports.ssl_match_hostname import match_hostname
from ssl import match_hostname
Copy link
Contributor

@absurdfarce absurdfarce Nov 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like exactly the right idea.

I'll also note that ssl.match_hostname has been deprecated since Python 3.7 and is actually removed in 3.12 (more on that in PYTHON-1331) so these changes will likely be subsequently changed based on whatever happens with that ticket (which is next in my queue). I very much like the other changes in this PR, though, so my inclination is to merge this now and just lay any fixes for PYTHON-1331 on top of this in their own PR.

ssl.match_hostname = match_hostname
except ImportError:
pass # tests will fail
Expand Down