Skip to content

Commit

Permalink
Merge branch 'aio-libs:master' into bcutler-isolate-client-for-ssl
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-cutler-datarobot authored Aug 22, 2023
2 parents 0f5a79a + ae8405c commit b611d5b
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
strategy:
matrix:
os: [ubuntu]
pyver: ['3.7', '3.8', '3.9', '3.10', '3.11']
pyver: ['3.8', '3.9', '3.10', '3.11']
redis: ['latest']
ujson: ['']
include:
Expand Down Expand Up @@ -87,6 +87,7 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}
allow-prereleases: true
cache: 'pip'
cache-dependency-path: '**/requirements*.txt'
- name: Install ujson
Expand Down
6 changes: 2 additions & 4 deletions aiocache/serializers/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@ def __init__(self, *args, encoding=_NOT_SET, **kwargs):
self.encoding = self.DEFAULT_ENCODING if encoding is _NOT_SET else encoding
super().__init__(*args, **kwargs)

# TODO(PY38): Positional-only
@abstractmethod
def dumps(self, value: Any) -> Any:
def dumps(self, value: Any, /) -> Any:
"""Serialise the value to be stored in the backend."""

# TODO(PY38): Positional-only
@abstractmethod
def loads(self, value: Any) -> Any:
def loads(self, value: Any, /) -> Any:
"""Decode the value retrieved from the backend."""


Expand Down
2 changes: 1 addition & 1 deletion docs/readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
image: latest

python:
version: 3.7
version: 3.11
pip_install: true
extra_requirements:
- redis
Expand Down
5 changes: 1 addition & 4 deletions examples/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,4 @@ async def main():


if __name__ == "__main__":
import sys

if sys.version_info >= (3, 8):
asyncio.run(main())
asyncio.run(main())
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[tool.black]
line-length = 99
target-version = ['py37','py38','py39','py310']
target-version = ['py38', 'py39', 'py310', 'py311']
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
long_description=readme,
classifiers=[
"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",
"Programming Language :: Python :: 3.12",
"Framework :: AsyncIO",
],
packages=("aiocache",),
Expand Down
5 changes: 0 additions & 5 deletions tests/ut/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import sys
from contextlib import ExitStack
from unittest.mock import create_autospec, patch

Expand All @@ -8,10 +7,6 @@
from aiocache.plugins import BasePlugin
from ..utils import AbstractBaseCache, ConcreteBaseCache

if sys.version_info < (3, 8):
# Missing AsyncMock on 3.7
collect_ignore_glob = ["*"]


@pytest.fixture(autouse=True)
def reset_caches():
Expand Down

0 comments on commit b611d5b

Please sign in to comment.