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

Python 3.12 #2979

Merged
merged 34 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
71c1478
Python 3.12
chayim Oct 5, 2023
7a679c2
Merge branch 'master' into ckpy312
chayim Oct 5, 2023
2a81f8a
removed quote
chayim Oct 18, 2023
296962c
Merge branch 'master' into ckpy312
chayim Oct 18, 2023
8fe9064
invoke upgrade
chayim Oct 18, 2023
c668538
Merge branch 'master' into ckpy312
chayim Jan 1, 2024
88bede2
Merge branch 'master' into ckpy312
chayim Jan 10, 2024
be650f4
ssl context wrapper change for test
chayim Jan 10, 2024
9a5b8e8
removing the |=
chayim Jan 10, 2024
e6487ed
seeing how codeql tls silencing works
chayim Jan 11, 2024
9ddbd87
Merge remote-tracking branch 'origin/master' into ck_py312
gerzse Jul 3, 2024
1a51cb4
Stabilize more tests and fix linters
gerzse Jul 4, 2024
b2a71a9
Stop requiring typing-extensions
gerzse Jul 4, 2024
f55036d
Enable tracemalloc
gerzse Jul 4, 2024
404405a
Better tracemalloc
gerzse Jul 4, 2024
1634946
Handle possible errors at SSL handshake
gerzse Jul 4, 2024
fcd9670
Remove event_loop fixture, as suggested by pytest
gerzse Jul 4, 2024
35efa8e
Fix async tests
gerzse Jul 4, 2024
976ae66
Merge remote-tracking branch 'origin/master' into ck_py312
gerzse Jul 4, 2024
0920116
Fix test results visualization in CI
gerzse Jul 4, 2024
dfa2a9c
More test fixes
gerzse Jul 5, 2024
71d83b3
Enable test profiling
gerzse Jul 5, 2024
663e3de
Fix upload of tests results
gerzse Jul 5, 2024
3668b43
Fix upload of tests results
gerzse Jul 5, 2024
0e62ac3
Fix upload of tests results
gerzse Jul 5, 2024
6b5f241
Fix upload of tests results
gerzse Jul 5, 2024
a595ff7
Remove CI test reporting
gerzse Jul 8, 2024
b9ae081
Speed up cluster slot initialization
gerzse Jul 8, 2024
8387597
Fix CI
gerzse Jul 8, 2024
8b1469d
Remove line profiler, it does not play well with PyPy
gerzse Jul 8, 2024
9aeec4c
Make profiling optional
gerzse Jul 8, 2024
097938a
Improve async cluster connection initialization
gerzse Jul 8, 2024
f6ed3c5
Run uvloop tests in matrix
gerzse Jul 8, 2024
bb73758
Speed up coverage with Python 3.12
gerzse Jul 9, 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
6 changes: 3 additions & 3 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
max-parallel: 15
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.8', 'pypy-3.9']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9']
test-type: ['standalone', 'cluster']
connection-type: ['hiredis', 'plain']
env:
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.11']
python-version: ['3.8', '3.12']
test-type: ['standalone', 'cluster']
connection-type: ['hiredis', 'plain']
protocol: ['3']
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.8', 'pypy-3.9']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9']
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ packaging>=20.4
pytest==7.2.0
pytest-timeout==2.1.0
pytest-asyncio>=0.20.2
invoke==1.7.3
invoke==2.2.0
pytest-cov>=4.0.0
vulture>=2.3.0
ujson>=4.2.0
Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
author_email="[email protected]",
python_requires=">=3.8",
install_requires=[
'async-timeout>=4.0.2; python_full_version<="3.11.2"',
'typing-extensions; python_version<"3.8"',
'async-timeout>=4.0.3',
],
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand All @@ -51,11 +52,12 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
extras_require={
"hiredis": ["hiredis>=1.0.0"],
"ocsp": ["cryptography>=36.0.1", "pyopenssl==20.0.1", "requests>=2.26.0"],
"ocsp": ["cryptography>=36.0.1", "pyopenssl==23.2.1", "requests>=2.31.0"],
},
)
18 changes: 14 additions & 4 deletions tests/test_connect.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,23 @@
if self._certfile is None:
return super().get_request()
newsocket, fromaddr = self.socket.accept()
connstream = ssl.wrap_socket(
context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
context.load_cert_chain(certfile=self._certfile, keyfile=self._keyfile)
context.options |= ssl.OP_NO_TLSv1_1
connstream = context.wrap_socket(
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
newsocket,
server_side=True,
certfile=self._certfile,
keyfile=self._keyfile,
ssl_version=ssl.PROTOCOL_TLSv1_2,
# certfile=self._certfile,
# keyfile=self._keyfile,
# ssl_version=ssl.PROTOCOL_TLSv1_2,
)
# connstream = ssl.wrap_socket(
# newsocket,
# server_side=True,
# certfile=self._certfile,
# keyfile=self._keyfile,
# ssl_version=ssl.PROTOCOL_TLSv1_2,
# )
return connstream, fromaddr


Expand Down
Loading