Merge branch 'updates'

.github/workflows/build.yml

@@ -13,14 +13,17 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
-          - "3.10.0-rc.1"
-          - "pypy3"
+          - "3.10"
+          - "3.11"
+          - "pypy3.7"
+          - "pypy3.8"
+          - "pypy3.9"
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - run: sudo apt-get install -y libffi-dev
@@ -33,29 +36,29 @@ jobs:
     needs: test
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
       - run: pip install -U pip setuptools wheel
-      - run: pip install build==0.6.0.post1
+      - run: pip install build==0.9.0
       - run: python -m build --sdist .
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: sdist
           path: ./dist/*.tar.gz
   cibuildwheel:
     needs: test
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.1.1
-      - uses: actions/upload-artifact@v2
+        uses: pypa/cibuildwheel@v2.11.3
+      - uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: ./wheelhouse/*.whl

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',

pyproject.toml

@@ -2,7 +2,17 @@
 requires = ["setuptools", "wheel", "cffi", "setuptools_scm"]
 
 [tool.cibuildwheel]
-build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "pp37-*"]
+build = [
+    "cp36-manylinux_*",
+    "cp37-manylinux_*",
+    "cp38-manylinux_*",
+    "cp39-manylinux_*",
+    "cp310-manylinux_*",
+    "cp311-manylinux_*",
+    "pp37-manylinux_*",
+    "pp38-manylinux_*",
+    "pp39-manylinux_*"
+]
 build-frontend = "build"
 
 [tool.cibuildwheel.linux]

requirements.txt

@@ -1,70 +1,87 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    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.0.12
     # via requests
-coverage==5.5
+coverage[toml]==6.2
     # 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
+flake8==5.0.4
     # via -r requirements.in
 hiredis==2.0.0
     # via aioredis
-idna==3.2
+idna==3.4
     # via requests
+importlib-metadata==4.2.0
+    # via
+    #   flake8
+    #   pluggy
+    #   pytest
+    #   redis
 iniconfig==1.1.1
     # via pytest
-mccabe==0.6.1
+mccabe==0.7.0
     # via flake8
-packaging==21.0
-    # via pytest
+packaging==21.3
+    # via
+    #   pytest
+    #   redis
 pluggy==1.0.0
     # via pytest
-py==1.10.0
+py==1.11.0
     # via pytest
-pycodestyle==2.7.0
+pycodestyle==2.9.1
     # via flake8
-pycparser==2.20
+pycparser==2.21
     # via cffi
-pyflakes==2.3.1
+pyflakes==2.5.0
     # via flake8
-pyparsing==2.4.7
+pyparsing==3.0.9
     # via packaging
-pytest==6.2.5
+pytest==7.0.1
     # via
     #   -r requirements.in
     #   pytest-asyncio
     #   pytest-cov
-pytest-asyncio==0.15.1
+pytest-asyncio==0.16.0
     # via -r requirements.in
-pytest-cov==2.12.1
+pytest-cov==4.0.0
     # via -r requirements.in
-redis==3.5.3
+redis==4.3.5
     # via -r requirements.in
-requests==2.26.0
+requests==2.27.1
     # via coveralls
-toml==0.10.2
+tomli==1.2.3
     # via
+    #   coverage
     #   pytest
-    #   pytest-cov
-urllib3==1.26.6
+typing-extensions==4.1.1
+    # via
+    #   async-timeout
+    #   importlib-metadata
+    #   redis
+urllib3==1.26.13
     # via requests
+zipp==3.6.0
+    # via importlib-metadata

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'
     ],