Skip to content

Commit

Permalink
Merge pull request #21 from ChrisLovering/bump-redis
Browse files Browse the repository at this point in the history
Bump redis & fakeredis to latest
  • Loading branch information
HassanAbouelela committed Jan 30, 2024
2 parents 198602c + 840fba7 commit 33c7515
Show file tree
Hide file tree
Showing 8 changed files with 404 additions and 361 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/lint_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
PYTHONUSERBASE: ${{ github.workspace }}/.cache/py-user-base

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python
id: python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.8'

- name: Restore Python environment
id: pycache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.PYTHONUSERBASE }}
key: "${{ runner.os }}-\
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@ name: Release to PyPI
on:
release:
types: [published]
tags-ignore:
- '**dev**'
- '**rc**'


jobs:
build:
name: Build dist & publish
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
if: ! ${{ contains(github.ref, 'dev') || contains(github.ref, 'rc') }}

steps:
- name: Checkout the repo and the submodules.
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: '3.8'

Expand All @@ -27,6 +25,7 @@ jobs:
python -m pip install --upgrade pip
pip install setuptools wheel
python setup.py sdist bdist_wheel
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@v1.3.1
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ on:
jobs:
build:
name: Build dist & publish to test.pypi.org
runs-on: ubuntu-18.04
runs-on: ubuntu-latest

steps:
- name: Checkout the repo and the submodules.
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: '3.8'

Expand All @@ -25,6 +25,7 @@ jobs:
python -m pip install --upgrade pip
pip install setuptools wheel
python setup.py sdist bdist_wheel
- name: Publish dev/rc build to test.pypi.org
uses: pypa/gh-action-pypi-publish@v1.3.1
with:
Expand Down
24 changes: 12 additions & 12 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
flake8 = "~=3.8.3"
flake8-annotations = "~=2.4.0"
flake8-bugbear = "~=20.1.4"
flake8-docstrings = "~=1.5.0"
flake8-import-order = "~=0.18.1"
flake8 = "~=6.1.0"
flake8-annotations = "~=3.0.1"
flake8-bugbear = "~=23.9.16"
flake8-docstrings = "~=1.7.0"
flake8-import-order = "~=0.18.2"
flake8-string-format = "~=0.3.0"
flake8-tidy-imports = "~=4.1.0"
flake8-tidy-imports = "~=4.10.0"
flake8-todo = "~=0.7"
pep8-naming = "~=0.11.0"
"coverage[toml]" = "~=5.3"
coveralls = "~=2.2.0"
time-machine = "~=1.3.0"
pep8-naming = "~=0.13.3"
"coverage[toml]" = "~=6.5.0"
coveralls = "~=3.3.1"
time-machine = "~=2.13.0"

[packages]
redis = "~=4.2"
"fakeredis[lua]" = "~=1.7.1"
redis = "~=5.0"
"fakeredis[lua]" = "~=2.0"

[requires]
python_version = "3.8"
Expand Down
692 changes: 366 additions & 326 deletions Pipfile.lock

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions async_rediscache/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,14 @@ def pool(self) -> redis.asyncio.ConnectionPool:
before the connect method is called.
"""
# The validation and error logic is handled by the client property
warnings.warn(DeprecationWarning(
"pool property is deprecated. Most operations should be performed on "
"the client directly. Operations which benefit from managing the pool directly "
"can access it from client.connection_pool."
))
warnings.warn(
DeprecationWarning(
"pool property is deprecated. Most operations should be performed on "
"the client directly. Operations which benefit from managing the pool directly "
"can access it from client.connection_pool.",
),
stacklevel=2,
)
return self.client.connection_pool

async def connect(self, *, ping: bool = True) -> RedisSession:
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name="async-rediscache",
version="1.0.0rc2",
version="1.0.0rc3",
description="An easy to use asynchronous Redis cache",
long_description=open("README.md").read(),
long_description_content_type="text/markdown",
Expand All @@ -24,20 +24,20 @@
"Development Status :: 4 - Beta",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Framework :: AsyncIO",
"Topic :: Database",
"Topic :: Software Development :: Libraries :: Python Modules",
],
install_requires=[
"redis~=4.2"
"redis~=5.0"
],
python_requires='~=3.7',
python_requires='~=3.8',
extras_require={
"fakeredis": ["fakeredis[lua]>=1.7.1"],
"fakeredis": ["fakeredis[lua]~=2.0"],
},
include_package_data=True,
zip_safe=False
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ignore=
# Docstring Content
D400,D401,D402,D404,D405,D406,D407,D408,D409,D410,D411,D412,D413,D414,D416,D417
# Type Annotations
ANN002,ANN003,ANN101,ANN102,ANN204,ANN206
ANN002,ANN003,ANN101,ANN102,ANN204,ANN206,ANN401
per-file-ignores=
tests/*:D,ANN,N802,
*/__init__.py:F

0 comments on commit 33c7515

Please sign in to comment.