From de325abc8aa6d8bbb77b79053411a05096a5944d Mon Sep 17 00:00:00 2001 From: Bruce Merry Date: Sat, 10 Dec 2022 17:37:25 +0200 Subject: [PATCH] Update to more modern versions - Test against Python 3.10 final, and Python 3.11 - Update everything in requirements.txt - Remove positional db argument from from_url: not compatible with latest versions of redis-py --- .github/workflows/build.yml | 3 +- birdisle/redis.py | 4 +-- requirements.txt | 56 ++++++++++++++++++------------------- setup.py | 1 + 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d79e57a..cff071f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,8 @@ jobs: - "3.7" - "3.8" - "3.9" - - "3.10.0-rc.1" + - "3.10" + - "3.11" - "pypy3" runs-on: ubuntu-20.04 steps: diff --git a/birdisle/redis.py b/birdisle/redis.py index 2a597d2..d385577 100644 --- a/birdisle/redis.py +++ b/birdisle/redis.py @@ -93,11 +93,11 @@ def __init__(self, server=None, host='localhost', port=6379, health_check_interval, client_name, username) @classmethod - def from_url(cls, url, db=None, **kwargs): + def from_url(cls, url, **kwargs): server = kwargs.pop('server', None) if server is None: server = birdisle.Server() - self = super().from_url(url, db, **kwargs) + self = super().from_url(url, **kwargs) self.connection_pool.connection_class = LocalSocketConnection self.connection_pool.connection_kwargs['server'] = server # When url is a unix:// URL, connection_kwargs will include 'path', diff --git a/requirements.txt b/requirements.txt index 527c909..37f56e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,70 +1,70 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile requirements.in # aioredis==1.3.1 # via -r requirements.in -async-timeout==3.0.1 - # via aioredis -attrs==21.2.0 +async-timeout==4.0.2 + # via + # aioredis + # redis +attrs==22.1.0 # via pytest certifi==2022.12.7 # via requests -cffi==1.14.6 +cffi==1.15.1 # via -r requirements.in -charset-normalizer==2.0.4 +charset-normalizer==2.1.1 # via requests -coverage==5.5 +coverage[toml]==6.5.0 # via # -r requirements.in # coveralls # pytest-cov -coveralls==3.2.0 +coveralls==3.3.1 # via -r requirements.in docopt==0.6.2 # via coveralls -flake8==3.9.2 +exceptiongroup==1.0.4 + # via pytest +flake8==6.0.0 # via -r requirements.in hiredis==2.0.0 # via aioredis -idna==3.2 +idna==3.4 # via requests iniconfig==1.1.1 # via pytest -mccabe==0.6.1 +mccabe==0.7.0 # via flake8 -packaging==21.0 +packaging==22.0 # via pytest pluggy==1.0.0 # via pytest -py==1.10.0 - # via pytest -pycodestyle==2.7.0 +pycodestyle==2.10.0 # via flake8 -pycparser==2.20 +pycparser==2.21 # via cffi -pyflakes==2.3.1 +pyflakes==3.0.1 # via flake8 -pyparsing==2.4.7 - # via packaging -pytest==6.2.5 +pytest==7.2.0 # via # -r requirements.in # pytest-asyncio # pytest-cov -pytest-asyncio==0.15.1 +pytest-asyncio==0.20.3 # via -r requirements.in -pytest-cov==2.12.1 +pytest-cov==4.0.0 # via -r requirements.in -redis==3.5.3 +redis==4.4.0 # via -r requirements.in -requests==2.26.0 +requests==2.28.1 # via coveralls -toml==0.10.2 +tomli==2.0.1 # via + # coverage # pytest - # pytest-cov -urllib3==1.26.6 +urllib3==1.26.13 # via requests diff --git a/setup.py b/setup.py index e119e6b..1d39ba5 100755 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Database', 'Topic :: Software Development :: Testing' ],