Merge branch 'aio-libs:master' into master

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,96 @@
+---
+name: Bug Report
+description: Create a report to help us improve.
+labels: [bug]
+body:
+- type: markdown
+  attributes:
+    value: |
+      **Thanks for taking a minute to file a bug report!**
+
+      ⚠
+      Verify first that your issue is not [already reported on
+      GitHub][issue search].
+
+      _Please fill out the form below with as many precise
+      details as possible._
+
+      [issue search]: ../search?q=is%3Aissue&type=issues
+
+- type: textarea
+  attributes:
+    label: Describe the bug
+    description: >-
+      A clear and concise description of what the bug is.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: To Reproduce
+    description: >-
+      Describe the steps to reproduce this bug.
+    placeholder: |
+      1. Create a certain environment (OS, Environment Variables, etc)
+      2. Run a code snippet '...'
+      3. Describe the error that is occurring
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: >-
+      A clear and concise description of what you expected to happen.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Logs/tracebacks
+    description: |
+      If applicable, add logs/tracebacks to help explain your problem.
+      Paste the output of the steps above, including the commands
+      themselves and their output/traceback etc.
+    render: python-traceback
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Python Version
+    description: Attach your version of Python.
+    render: console
+    value: |
+      $ python --version
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: aioredis Version
+    description: Attach your version of aioredis.
+    render: console
+    value: |
+      $ python -m pip show aioredis
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Additional context
+    description: |
+      Add any other context about the problem here.
+
+      Describe the environment you have that lead to your issue.
+
+- type: checkboxes
+  attributes:
+    label: Code of Conduct
+    description: |
+      Read the [aio-libs Code of Conduct][CoC] first.
+
+      [CoC]: https://github.com/aio-libs/.github/blob/master/CODE_OF_CONDUCT.md
+    options:
+    - label: I agree to follow the aio-libs Code of Conduct
+      required: true
+...

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,9 @@
+# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
+blank_issues_enabled: false  # default: true
+contact_links:
+- name: 💬 Discussion
+  url: https://github.com/aio-libs/aioredis-py/discussions
+  about: Please start discussions here
+- name: 💬 Discord Chat
+  url: https://discord.gg/eFHC2Pmv9N
+  about: Chat with devs and community

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,61 @@
+---
+name: 🚀 Feature request
+description: Suggest an idea for this project.
+labels: enhancement
+body:
+- type: markdown
+  attributes:
+    value: |
+      **Thanks for taking a minute to file a feature for aioredis!**
+
+      ⚠
+      Verify first that your feature request is not [already reported on
+      GitHub][issue search].
+
+      _Please fill out the form below with as many precise
+      details as possible._
+
+      [issue search]: ../search?q=is%3Aissue&type=issues
+
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem?
+    description: >-
+       Please add a clear and concise description of what
+       the problem is. _Ex. I'm always frustrated when [...]_
+
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like
+    description: >-
+      A clear and concise description of what you want to happen.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Describe alternatives you've considered
+    description: >-
+      A clear and concise description of any alternative solutions
+      or features you've considered.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Additional context
+    description: >-
+      Add any other context or screenshots about
+      the feature request here.
+
+- type: checkboxes
+  attributes:
+    label: Code of Conduct
+    description: |
+      Read the [aio-libs Code of Conduct][CoC] first.
+
+      [CoC]: https://github.com/aio-libs/.github/blob/master/CODE_OF_CONDUCT.md
+    options:
+    - label: I agree to follow the aio-libs Code of Conduct
+      required: true
+...

.github/dependabot.yml

@@ -14,7 +14,6 @@ updates:
     directory: "/"
     labels:
       - dependencies
-      - autosquash
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     timeout-minutes: 5
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.4.0
     - name: Setup Python 3.8
       uses: actions/setup-python@v2
       with:
@@ -39,6 +39,10 @@ jobs:
       uses: py-actions/py-dependency-install@v2.1.0
       with:
         path: tests/requirements.txt
+    - name: Run mypy
+      run: |
+        pip install -r tests/requirements-mypy.txt
+        mypy
     - name: Run linter
       run: |
         make lint
@@ -56,7 +60,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        pyver: [3.6, 3.7, 3.8, 3.9, pypy3]
+        pyver: ["3.6", "3.7", "3.8", "3.9", "3.10", pypy3]
         uvloop: [uvloop, no-uvloop]
         redis: [5.0.10, 6.2.4]
         exclude:
@@ -85,7 +89,7 @@ jobs:
       PYTEST_ADDOPTS: --${{ matrix.uvloop }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.4.0
     - name: Setup Python ${{ matrix.pyver }}
       uses: actions/setup-python@v2
       with:
@@ -131,11 +135,11 @@ jobs:
    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
    steps:
    - name: Checkout
-     uses: actions/checkout@v2.3.4
+     uses: actions/checkout@v2.4.0
    - name: Setup Python 3.8
      uses: actions/setup-python@v2
      with:
-       python-version: 3.8
+       python-version: "3.8"
    - name: Install dependencies
      run:
        python -m pip install -U pip wheel twine

.github/workflows/pre-commit-autoupdate.yml

@@ -13,7 +13,7 @@ jobs:
   auto-update:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
     - uses: actions/setup-python@v2
       with:
         python-version: 3.8
@@ -25,7 +25,7 @@ jobs:
       run: pre-commit autoupdate
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3.10.0
+      uses: peter-evans/create-pull-request@v3.11.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

.mypy.ini

@@ -0,0 +1,26 @@
+[mypy]
+#, docs/examples, tests
+files = aioredis
+check_untyped_defs = True
+follow_imports_for_stubs = True
+#disallow_any_decorated = True
+#disallow_any_generics = True
+#disallow_incomplete_defs = True
+disallow_subclassing_any = True
+#disallow_untyped_calls = True
+disallow_untyped_decorators = True
+#disallow_untyped_defs = True
+implicit_reexport = False
+no_implicit_optional = True
+show_error_codes = True
+strict_equality = True
+warn_incomplete_stub = True
+warn_redundant_casts = True
+warn_unreachable = True
+warn_unused_ignores = True
+disallow_any_unimported = True
+#warn_return_any = True
+
+[mypy-aioredis.lock]
+# TODO: Remove once locks has been rewritten
+ignore_errors = True

.pre-commit-config.yaml

@@ -11,16 +11,16 @@ repos:
   hooks:
   - id: check-merge-conflict
 - repo: https://github.com/asottile/yesqa
-  rev: v1.2.3
+  rev: v1.3.0
   hooks:
   - id: yesqa
 - repo: https://github.com/pycqa/isort
-  rev: '5.9.3'
+  rev: '5.10.1'
   hooks:
   - id: isort
     args: ["--profile", "black"]
 - repo: https://github.com/psf/black
-  rev: '21.8b0'
+  rev: '21.10b0'
   hooks:
   - id: black
     language_version: python3 # Should be a command that runs python3.6+
@@ -55,12 +55,12 @@ repos:
   - id: detect-private-key
     exclude: ^examples|(?:tests/ssl)/
 - repo: https://github.com/asottile/pyupgrade
-  rev: 'v2.26.0'
+  rev: 'v2.29.0'
   hooks:
   - id: pyupgrade
     args: ['--py36-plus', '--keep-mock']
 - repo: https://github.com/PyCQA/flake8
-  rev: '3.9.2'
+  rev: '4.0.1'
   hooks:
   - id: flake8
     exclude: "^docs/"

CHANGES/1080.feature

@@ -0,0 +1 @@
+Introduce issue forms

CHANGES/1095.misc

@@ -0,0 +1 @@
+Update url for repository rename in setup.py

CHANGES/1101.misc

@@ -0,0 +1 @@
+Enable Mypy in CI.

CHANGES/1109.doc

@@ -0,0 +1 @@
+Document breaking API changes in redis 2.x.

CHANGES/1141.bugfix

@@ -0,0 +1 @@
+Fix type annotation of `socket_keepalive_options` arguments when creating connections and clients

CHANGES/1159.doc

@@ -0,0 +1 @@
+Fix errors in getting started examples; Unify style of getting started examples with other examples.

CHANGES/1167.doc

@@ -0,0 +1 @@
+Add the rest of the requirements

CHANGES/1212.bugfix

@@ -0,0 +1 @@
+Fix buffer is closed error when using PythonParser class

CHANGES/1214.bugfix

@@ -0,0 +1 @@
+Fix typing on evalsha keys_and_args argument

CONTRIBUTORS.txt

@@ -10,6 +10,7 @@ Alexander Shorin
 Aliaksei Urbanski
 Andrew Chen Wang
 Andrew Svetlov
+Anes Abismail
 Anton Ilyushenkov <driverx>
 Anton Salii
 Anton Verinov
@@ -27,21 +28,25 @@ Dmitry Vasilishin <dmvass>
 Evgenii Morozov <emorozov>
 Federico Jaite <fedej>
 Hugo <hugovk>
+Ian Good
 Ihor Gorobets
 Ihor Liubymov
 Ilya Samartsev
 Ivan Antonyuck
 James Hilliard
 Jan Špaček
 Jeff Moser
+Joongi Kim <achimnol>
 Kyrylo Dehtyarenko
 Leonid Shvechikov
+Maksim Novikov
 Manuel Miranda
 Marek Szapiel
 Marijn Giesen
 Martin <the-panda>
 Maxim Dodonchuk
 Michael Käufl
+Mikhail Solomenik
 Nickolai Novik
 Oleg Abramov
 Oleg Butuzov

Makefile

@@ -17,7 +17,7 @@ spelling:
 	$(MAKE) -C docs spelling
 
 mypy:
-	$(MYPY) aioredis --ignore-missing-imports
+	$(MYPY)
 
 test:
 	$(PYTEST)
@@ -38,7 +38,7 @@ init-hooks:
 	pre-commit install-hooks
 
 lint: init-hooks
-	pre-commit run --all-files
+	pre-commit run --all-files --show-diff-on-failure
 
 devel: aioredis.egg-info init-hooks
 	pip install -U pip