From f628f670c9256ba0205498cfd476485402efa24f Mon Sep 17 00:00:00 2001
From: Saugat Pachhai <suagatchhetri@outlook.com>
Date: Fri, 8 Oct 2021 18:35:05 +0545
Subject: [PATCH] advertise Python 3.10 support (#6772)

* advertise Python 3.10 support

Pygit2 does not have windows wheels yet and no pyarrow
for 3.10. But these platform-dependent things and
remote-dependent things should not stop us from
advertising support as we are pure-python based
package and we cannot claim support for all of our
dependencies.

* set pygit2 for Python 3.6 to <1.7
---
 .github/workflows/tests.yaml | 20 +++++---------------
 setup.cfg                    |  4 +++-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 86af27bf4..f8ce02678 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -45,17 +45,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-2019, macos-10.15]
-        pyv: ["3.6", "3.7", "3.8", "3.9"]
-        include:
-          - os: "macos-10.15"
-            pyv: "3.10"
+        os: [ubuntu-20.04, windows-latest, macos-latest]
+        pyv: ["3.6", "3.7", "3.8", "3.9", "3.10"]
         exclude:
-          - os: macos-10.15
-            pyv: "3.9"
-          - os: macos-10.15
-            pyv: "3.7"
-
+          # no wheels for pygit2 yet
+          - os: windows-latest
+            pyv: "3.10"
     steps:
     - uses: actions/checkout@v2.3.4
     - name: Set up Python
@@ -74,11 +69,6 @@ jobs:
         key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}
         restore-keys: |
           ${{ runner.os }}-pip-
-    - name: install pygit2 on Python3.10 in macOS
-      if: matrix.pyv == '3.10' && matrix.os == 'macos-10.15'
-      run: |
-        brew update && brew install libgit2
-        pip install git+https://github.com/libgit2/pygit2
     - name: install
       if: steps.cache.pip-cache-dir.cache-hit != 'true'
       run: |
diff --git a/setup.cfg b/setup.cfg
index f601d7f14..ca21df133 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [options]
 python_requires = >=3.6
@@ -36,7 +37,8 @@ install_requires =
     configobj>=5.0.6
     gitpython>3
     dulwich>=0.20.23
-    pygit2>=1.5.0
+    pygit2>=1.5.0,<1.7; python_version < '3.7'
+    pygit2>=1.5.0; python_version >= '3.7'
     setuptools>=34.0.0
     nanotime>=0.5.2
     pyasn1>=0.4.1