Skip to content

Commit b6504e6

Browse files
agronholmagronholm
authored
Merge branch 'master' into anyio
2 parents b03e927 + 513c8d0 commit b6504e6

Some content is hidden

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

55 files changed

+1702
-667
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ _Please make sure to review and check all of these items:_
77
- [ ] Is the new or changed code fully tested?
88
- [ ] Is a documentation update included (if this change modifies existing APIs, or introduces new ones)?
99
- [ ] Is there an example added to the examples folder (if applicable)?
10-
- [ ] Was the change added to CHANGES file?
1110

1211
_NOTE: these things are not required to open a PR and can be done
1312
afterwards / while the PR is open._

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

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ runs:
4646
CLIENT_LIBS_TEST_IMAGE_TAG: ${{ inputs.redis-version }}
4747
run: |
4848
set -e
49-
49+
5050
echo "::group::Installing dependencies"
5151
pip install -r dev_requirements.txt
5252
pip uninstall -y redis # uninstall Redis package installed via redis-entraid
@@ -57,80 +57,81 @@ runs:
5757
pip install -e ./hiredis-py
5858
else
5959
pip install "hiredis${{inputs.hiredis-version}}"
60-
fi
60+
fi
6161
echo "PARSER_BACKEND=$(echo "${{inputs.parser-backend}}_${{inputs.hiredis-version}}" | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_ENV
6262
else
6363
echo "PARSER_BACKEND=${{inputs.parser-backend}}" >> $GITHUB_ENV
6464
fi
6565
echo "::endgroup::"
66-
66+
6767
echo "::group::Starting Redis servers"
6868
redis_major_version=$(echo "$REDIS_VERSION" | grep -oP '^\d+')
6969
echo "REDIS_MAJOR_VERSION=${redis_major_version}" >> $GITHUB_ENV
70-
70+
7171
if (( redis_major_version < 8 )); then
7272
echo "Using redis-stack for module tests"
73-
74-
# Mapping of redis version to stack version
73+
74+
# Mapping of redis version to stack version
7575
declare -A redis_stack_version_mapping=(
76-
["7.4.2"]="rs-7.4.0-v2"
77-
["7.2.7"]="rs-7.2.0-v14"
78-
["6.2.17"]="rs-6.2.6-v18"
76+
["7.4.4"]="rs-7.4.0-v5"
77+
["7.2.9"]="rs-7.2.0-v17"
7978
)
80-
79+
8180
if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
8281
export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=${redis_stack_version_mapping[$REDIS_VERSION]}
8382
echo "REDIS_MOD_URL=redis://127.0.0.1:6479/0" >> $GITHUB_ENV
8483
else
8584
echo "Version not found in the mapping."
8685
exit 1
8786
fi
88-
87+
8988
if (( redis_major_version < 7 )); then
9089
export REDIS_STACK_EXTRA_ARGS="--tls-auth-clients optional --save ''"
91-
export REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"
90+
export REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"
9291
fi
93-
92+
9493
invoke devenv --endpoints=all-stack
94+
9595
else
9696
echo "Using redis CE for module tests"
97+
export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=$REDIS_VERSION
9798
echo "REDIS_MOD_URL=redis://127.0.0.1:6379" >> $GITHUB_ENV
9899
invoke devenv --endpoints all
99-
fi
100-
100+
fi
101+
101102
sleep 10 # time to settle
102103
echo "::endgroup::"
103104
shell: bash
104105

105106
- name: Run tests
106107
run: |
107108
set -e
108-
109+
109110
run_tests() {
110111
local protocol=$1
111112
local eventloop=""
112-
113+
113114
if [ "${{inputs.event-loop}}" == "uvloop" ]; then
114115
eventloop="--uvloop"
115116
fi
116-
117+
117118
echo "::group::RESP${protocol} standalone tests"
118119
echo "REDIS_MOD_URL=${REDIS_MOD_URL}"
119-
120+
120121
if (( $REDIS_MAJOR_VERSION < 7 )) && [ "$protocol" == "3" ]; then
121122
echo "Skipping module tests: Modules doesn't support RESP3 for Redis versions < 7"
122123
invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}" --extra-markers="not redismod and not cp_integration"
123-
else
124+
else
124125
invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}"
125126
fi
126-
127+
127128
echo "::endgroup::"
128-
129+
129130
echo "::group::RESP${protocol} cluster tests"
130131
invoke cluster-tests $eventloop --protocol=${protocol}
131-
echo "::endgroup::"
132+
echo "::endgroup::"
132133
}
133-
134+
134135
run_tests 2 "${{inputs.event-loop}}"
135136
run_tests 3 "${{inputs.event-loop}}"
136137
shell: bash

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ env:
2323
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2424
# this speeds up coverage with Python 3.12: https://github.com/nedbat/coveragepy/issues/1665
2525
COVERAGE_CORE: sysmon
26-
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: 'rs-7.4.0-v2'
27-
CURRENT_REDIS_VERSION: '7.4.2'
26+
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.0.2'
27+
CURRENT_REDIS_VERSION: '8.0.2'
2828

2929
jobs:
3030
redis_version:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- name: Compute outputs
3636
run: |
37-
echo "CURRENT=${{ env.CURRENT_REDIS_VERSION }}" >> $GITHUB_OUTPUT
37+
echo "CURRENT=${{ env.CURRENT_REDIS_VERSION }}" >> $GITHUB_OUTPUT
3838
3939
hiredis-tests:
4040
runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
48-
python-version: [ '3.8', '3.13']
48+
python-version: [ '3.9', '3.13']
4949
parser-backend: [ 'hiredis' ]
5050
hiredis-version: [ 'unstable' ]
5151
event-loop: [ 'asyncio' ]

‎.github/workflows/integration.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +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-
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: 'rs-7.4.0-v2'
31-
CURRENT_REDIS_VERSION: '7.4.2'
30+
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.0.2'
31+
CURRENT_REDIS_VERSION: '8.0.2'
3232

3333
jobs:
3434
dependency-audit:
@@ -74,8 +74,8 @@ jobs:
7474
max-parallel: 15
7575
fail-fast: false
7676
matrix:
77-
redis-version: ['8.0.1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7', '6.2.17']
78-
python-version: ['3.8', '3.13']
77+
redis-version: ['8.2-M01-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.4', '7.2.9']
78+
python-version: ['3.9', '3.13']
7979
parser-backend: ['plain']
8080
event-loop: ['asyncio']
8181
env:
@@ -123,9 +123,9 @@ jobs:
123123
fail-fast: false
124124
matrix:
125125
redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
126-
python-version: [ '3.8', '3.13']
126+
python-version: [ '3.9', '3.13']
127127
parser-backend: [ 'hiredis' ]
128-
hiredis-version: [ '>=3.0.0', '<3.0.0' ]
128+
hiredis-version: [ '>=3.2.0', '<3.0.0' ]
129129
event-loop: [ 'asyncio' ]
130130
env:
131131
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
@@ -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.13' ]
152+
python-version: [ '3.9', '3.13' ]
153153
parser-backend: [ 'plain' ]
154154
event-loop: [ 'uvloop' ]
155155
env:
@@ -191,7 +191,7 @@ jobs:
191191
strategy:
192192
fail-fast: false
193193
matrix:
194-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9', 'pypy-3.10']
194+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9', 'pypy-3.10']
195195
steps:
196196
- uses: actions/checkout@v4
197197
- uses: actions/setup-python@v5

‎.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@v4
1010
- name: Check Spelling
11-
uses: rojopolis/spellcheck-github-actions@0.48.0
11+
uses: rojopolis/spellcheck-github-actions@0.49.0
1212
with:
1313
config_path: .github/spellcheck-settings.yml
1414
task_name: Markdown

0 commit comments

Comments
 (0)