From 2ee1f10fc98b235dde68f84922c908838a79b342 Mon Sep 17 00:00:00 2001
From: Sam Harrison <sharrison@twilio.com>
Date: Mon, 7 Feb 2022 14:57:57 -0600
Subject: [PATCH 1/2] chore: upgrade supported language versions

---
 .github/workflows/test-and-deploy.yml | 4 ++--
 README.md                             | 1 +
 setup.py                              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index 9b2505a50b..f7ad8386fa 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        python-version: [ '3.6', '3.7', '3.8', '3.9' ]
+        python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10' ]
     steps:
       - name: Checkout twilio-python
         uses: actions/checkout@v2
@@ -60,7 +60,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |
diff --git a/README.md b/README.md
index 6fe94d95ff..78e9034c8e 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ This library supports the following Python implementations:
 * Python 3.7
 * Python 3.8
 * Python 3.9
+* Python 3.10
 
 ## Installation
 
diff --git a/setup.py b/setup.py
index 8616b17470..48be5177ff 100755
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Communications :: Telephony",

From 795ac28260facafd38e0ada727aa8c5489aa2384 Mon Sep 17 00:00:00 2001
From: Sam Harrison <sharrison@twilio.com>
Date: Tue, 8 Feb 2022 15:25:47 -0600
Subject: [PATCH 2/2] don't run sonar for every version or forks

---
 .github/workflows/test-and-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index f7ad8386fa..c4873a60cb 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -40,7 +40,7 @@ jobs:
 
       # only send coverage for PRs and branch updates
       - name: SonarCloud Scan
-        if: ${{ github.event_name == 'pull_request' || github.ref_type == 'branch' }}
+        if: (github.event_name == 'pull_request' || github.ref_type == 'branch') && !github.event.pull_request.head.repo.fork && matrix.python-version == '3.10'
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any