Skip to content

Commit 3d7e9a2

Browse files
authored
Merge branch 'master' into ps_add_test_for_info_and_modules
2 parents 0f87b46 + e1b8163 commit 3d7e9a2

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

.github/workflows/integration.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
fail-fast: false
7676
matrix:
7777
redis-version: ['8.0-M04-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7', '6.2.17']
78-
python-version: ['3.8', '3.12']
78+
python-version: ['3.8', '3.13']
7979
parser-backend: ['plain']
8080
event-loop: ['asyncio']
8181
env:
@@ -99,7 +99,7 @@ jobs:
9999
fail-fast: false
100100
matrix:
101101
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
102-
python-version: ['3.9', '3.10', '3.11', 'pypy-3.9', 'pypy-3.10']
102+
python-version: ['3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
103103
parser-backend: [ 'plain' ]
104104
event-loop: [ 'asyncio' ]
105105
env:
@@ -123,7 +123,7 @@ jobs:
123123
fail-fast: false
124124
matrix:
125125
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
126-
python-version: [ '3.8', '3.12']
126+
python-version: [ '3.8', '3.13']
127127
parser-backend: [ 'hiredis' ]
128128
hiredis-version: [ '>=3.0.0', '<3.0.0' ]
129129
event-loop: [ 'asyncio' ]
@@ -149,7 +149,7 @@ jobs:
149149
fail-fast: false
150150
matrix:
151151
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
152-
python-version: [ '3.8', '3.12' ]
152+
python-version: [ '3.8', '3.13' ]
153153
parser-backend: [ 'plain' ]
154154
event-loop: [ 'uvloop' ]
155155
env:
@@ -192,7 +192,7 @@ jobs:
192192
strategy:
193193
fail-fast: false
194194
matrix:
195-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
195+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9', 'pypy-3.10']
196196
steps:
197197
- uses: actions/checkout@v4
198198
- uses: actions/setup-python@v5

dev_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ packaging>=20.4
99
pytest
1010
pytest-asyncio>=0.23.0,<0.24.0
1111
pytest-cov
12-
pytest-profiling==1.7.0
12+
pytest-profiling==1.8.1
1313
pytest-timeout
1414
ujson>=4.2.0
1515
uvloop

docs/examples/connection_examples.ipynb

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,26 @@
7575
]
7676
},
7777
{
78-
"cell_type": "markdown",
78+
"cell_type": "code",
79+
"execution_count": 4,
7980
"metadata": {},
81+
"outputs": [
82+
{
83+
"data": {
84+
"text/plain": [
85+
"True"
86+
]
87+
},
88+
"execution_count": 4,
89+
"metadata": {},
90+
"output_type": "execute_result"
91+
}
92+
],
8093
"source": [
8194
"import redis\n",
8295
"\n",
8396
"r = redis.Redis(protocol=3)\n",
84-
"rcon.ping()"
97+
"r.ping()"
8598
]
8699
},
87100
{
@@ -93,7 +106,7 @@
93106
},
94107
{
95108
"cell_type": "code",
96-
"execution_count": 4,
109+
"execution_count": 5,
97110
"metadata": {},
98111
"outputs": [
99112
{
@@ -102,7 +115,7 @@
102115
"True"
103116
]
104117
},
105-
"execution_count": 4,
118+
"execution_count": 5,
106119
"metadata": {},
107120
"output_type": "execute_result"
108121
}

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"Programming Language :: Python :: 3.10",
5555
"Programming Language :: Python :: 3.11",
5656
"Programming Language :: Python :: 3.12",
57+
"Programming Language :: Python :: 3.13",
5758
"Programming Language :: Python :: Implementation :: CPython",
5859
"Programming Language :: Python :: Implementation :: PyPy",
5960
],

0 commit comments

Comments
 (0)