Skip to content

Commit b6bb330

Browse files
authored
Merge branch 'master' into fix_client_side_cache_using_bytes_key
2 parents 8f26217 + 360860e commit b6bb330

File tree

141 files changed

+29890
-7950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+29890
-7950
lines changed

.github/actions/run-tests/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ runs:
142142
sudo apt-get install -y redis-tools
143143
echo "Docker Containers:"
144144
docker ps
145+
echo "Cluster nodes:"
145146
redis-cli -p 16379 CLUSTER NODES
146147
shell: bash
147148

.github/wordlist.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
APM
22
ARGV
33
BFCommands
4+
balancer
45
CacheImpl
6+
cancelling
57
CAS
68
CFCommands
79
CMSCommands
@@ -10,19 +12,32 @@ ClusterNodes
1012
ClusterPipeline
1113
ClusterPubSub
1214
ConnectionPool
15+
config
1316
CoreCommands
17+
DatabaseConfig
18+
DNS
19+
EchoHealthCheck
1420
EVAL
1521
EVALSHA
22+
failover
23+
FQDN
1624
Grokzen's
25+
Healthcheck
26+
HealthCheckPolicies
27+
healthcheck
28+
healthchecks
1729
INCR
1830
IOError
1931
Instrumentations
2032
JSONCommands
2133
Jaeger
2234
Ludovico
2335
Magnocavallo
36+
MultiDbConfig
37+
MultiDBClient
2438
McCurdy
2539
NOSCRIPT
40+
NoValidDatabaseException
2641
NUMPAT
2742
NUMPT
2843
NUMSUB
@@ -43,6 +58,7 @@ RedisInstrumentor
4358
RedisJSON
4459
RedisTimeSeries
4560
SHA
61+
SLA
4662
SearchCommands
4763
SentinelCommands
4864
SentinelConnectionPool
@@ -52,6 +68,8 @@ SpanKind
5268
Specfiying
5369
StatusCode
5470
TCP
71+
TemporaryUnavailableException
72+
TLS
5573
TOPKCommands
5674
TimeSeriesCommands
5775
Uptrace
@@ -91,6 +109,7 @@ json
91109
keyslot
92110
keyspace
93111
kwarg
112+
kwargs
94113
linters
95114
localhost
96115
lua

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
# Initializes the CodeQL tools for scanning.
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@v3
43+
uses: github/codeql-action/init@v4
4444
with:
4545
languages: ${{ matrix.language }}
4646
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +51,7 @@ jobs:
5151
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5252
# If this step fails, then you should remove it and run the build manually (see below)
5353
- name: Autobuild
54-
uses: github/codeql-action/autobuild@v3
54+
uses: github/codeql-action/autobuild@v4
5555

5656
# ℹ️ Command-line programs to run using the OS shell.
5757
# 📚 https://git.io/JvXDl
@@ -65,4 +65,4 @@ jobs:
6565
# make release
6666

6767
- name: Perform CodeQL Analysis
68-
uses: github/codeql-action/analyze@v3
68+
uses: github/codeql-action/analyze@v4

.github/workflows/docs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- uses: actions/checkout@v5
29-
- uses: actions/setup-python@v5
29+
- uses: actions/setup-python@v6
3030
with:
31-
python-version: 3.9
31+
python-version: "3.10"
3232
cache: 'pip'
3333
- name: install deps
3434
run: |
@@ -40,7 +40,7 @@ jobs:
4040
invoke build-docs
4141
4242
- name: upload docs
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v5
4444
with:
4545
name: redis-py-docs
4646
path: |

.github/workflows/hiredis-py-integration.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
48-
python-version: [ '3.9', '3.13']
48+
python-version: [ '3.10', '3.14']
4949
parser-backend: [ 'hiredis' ]
5050
hiredis-version: [ 'unstable' ]
5151
event-loop: [ 'asyncio' ]
@@ -63,4 +63,4 @@ jobs:
6363
parser-backend: ${{ matrix.parser-backend }}
6464
redis-version: ${{ matrix.redis-version }}
6565
hiredis-version: ${{ matrix.hiredis-version }}
66-
hiredis-branch: ${{ inputs.hiredis-branch }}
66+
hiredis-branch: ${{ inputs.hiredis-branch }}

.github/workflows/install_and_test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ cd ${TESTDIR}
4040
# install, run tests
4141
pip install ${PKG}
4242
# Redis tests
43-
pytest -m 'not onlycluster' --ignore=tests/test_scenario
43+
pytest -m 'not onlycluster' --ignore=tests/test_scenario --ignore=tests/test_asyncio/test_scenario
4444
# RedisCluster tests
4545
CLUSTER_URL="redis://localhost:16379/0"
4646
CLUSTER_SSL_URL="rediss://localhost:27379/0"
4747
pytest -m 'not onlynoncluster and not redismod and not ssl' \
4848
--ignore=tests/test_scenario \
49+
--ignore=tests/test_asyncio/test_scenario \
4950
--redis-url="${CLUSTER_URL}" \
5051
--redis-ssl-url="${CLUSTER_SSL_URL}"

.github/workflows/integration.yaml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ env:
2727
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2828
# this speeds up coverage with Python 3.12: https://github.com/nedbat/coveragepy/issues/1665
2929
COVERAGE_CORE: sysmon
30+
# patch releases get included in the base version image when they are published
31+
# for example after 8.2.1 is published, 8.2 image contains 8.2.1 content
3032
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.2'
3133
CURRENT_REDIS_VERSION: '8.2'
3234

@@ -47,9 +49,9 @@ jobs:
4749
runs-on: ubuntu-latest
4850
steps:
4951
- uses: actions/checkout@v5
50-
- uses: actions/setup-python@v5
52+
- uses: actions/setup-python@v6
5153
with:
52-
python-version: 3.9
54+
python-version: "3.10"
5355
cache: 'pip'
5456
- name: run code linters
5557
run: |
@@ -74,8 +76,8 @@ jobs:
7476
max-parallel: 15
7577
fail-fast: false
7678
matrix:
77-
redis-version: ['8.2.1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '8.0.2' ,'7.4.4', '7.2.9']
78-
python-version: ['3.9', '3.13']
79+
redis-version: ['8.4-GA-pre.2', '${{ needs.redis_version.outputs.CURRENT }}', '8.0.2' ,'7.4.4', '7.2.9']
80+
python-version: ['3.10', '3.14']
7981
parser-backend: ['plain']
8082
event-loop: ['asyncio']
8183
env:
@@ -92,14 +94,14 @@ jobs:
9294

9395
python-compatibility-tests:
9496
runs-on: ubuntu-latest
95-
needs: [ redis_version, tests ]
97+
needs: [ redis_version ]
9698
timeout-minutes: 60
9799
strategy:
98100
max-parallel: 15
99101
fail-fast: false
100102
matrix:
101103
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
102-
python-version: ['3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
104+
python-version: ['3.11', '3.12', '3.13', 'pypy-3.10', 'pypy-3.11']
103105
parser-backend: [ 'plain' ]
104106
event-loop: [ 'asyncio' ]
105107
env:
@@ -116,14 +118,14 @@ jobs:
116118

117119
hiredis-tests:
118120
runs-on: ubuntu-latest
119-
needs: [redis_version, tests]
121+
needs: [redis_version]
120122
timeout-minutes: 60
121123
strategy:
122124
max-parallel: 15
123125
fail-fast: false
124126
matrix:
125127
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
126-
python-version: [ '3.9', '3.13']
128+
python-version: [ '3.10', '3.14']
127129
parser-backend: [ 'hiredis' ]
128130
hiredis-version: [ '>=3.2.0', '<3.0.0' ]
129131
event-loop: [ 'asyncio' ]
@@ -142,14 +144,14 @@ jobs:
142144

143145
uvloop-tests:
144146
runs-on: ubuntu-latest
145-
needs: [redis_version, tests]
147+
needs: [redis_version]
146148
timeout-minutes: 60
147149
strategy:
148150
max-parallel: 15
149151
fail-fast: false
150152
matrix:
151153
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
152-
python-version: [ '3.9', '3.13' ]
154+
python-version: [ '3.10', '3.14' ]
153155
parser-backend: [ 'plain' ]
154156
event-loop: [ 'uvloop' ]
155157
env:
@@ -168,16 +170,16 @@ jobs:
168170
build-and-test-package:
169171
name: Validate building and installing the package
170172
runs-on: ubuntu-latest
171-
needs: [tests]
173+
needs: [redis_version]
172174
strategy:
173175
fail-fast: false
174176
matrix:
175177
extension: ['tar.gz', 'whl']
176178
steps:
177179
- uses: actions/checkout@v5
178-
- uses: actions/setup-python@v5
180+
- uses: actions/setup-python@v6
179181
with:
180-
python-version: 3.9
182+
python-version: "3.10"
181183
- name: Run installed unit tests
182184
env:
183185
CLIENT_LIBS_TEST_IMAGE_TAG: ${{ env.CURRENT_REDIS_VERSION }}
@@ -191,10 +193,10 @@ jobs:
191193
strategy:
192194
fail-fast: false
193195
matrix:
194-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9', 'pypy-3.10']
196+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', 'pypy-3.10', 'pypy-3.11']
195197
steps:
196198
- uses: actions/checkout@v5
197-
- uses: actions/setup-python@v5
199+
- uses: actions/setup-python@v6
198200
with:
199201
python-version: ${{ matrix.python-version }}
200202
cache: 'pip'

.github/workflows/pypi-publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v5
1717
- name: install python
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
20-
python-version: 3.9
20+
python-version: "3.10"
2121
- run: pip install build twine
2222

2323
- name: Build package

.github/workflows/spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Checkout
99
uses: actions/checkout@v5
1010
- name: Check Spelling
11-
uses: rojopolis/spellcheck-github-actions@0.51.0
11+
uses: rojopolis/spellcheck-github-actions@0.53.0
1212
with:
1313
config_path: .github/spellcheck-settings.yml
1414
task_name: Markdown

0 commit comments

Comments
 (0)