From 8b284e50eb123f4935958434b916580360e3be3c Mon Sep 17 00:00:00 2001
From: Asif Saif Uddin <auvipy@gmail.com>
Date: Sun, 19 Dec 2021 11:09:56 +0600
Subject: [PATCH 1/4] test amqp v5.0.8

---
 requirements/default.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/default.txt b/requirements/default.txt
index f122501bf..0330a90e4 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -1,4 +1,4 @@
 importlib-metadata>=0.18; python_version<"3.8"
 cached_property; python_version<"3.8"
-amqp>=5.0.7,<6.0.0
+amqp>=5.0.8,<6.0.0
 vine

From 8d8b247408a55282c7edcb8ef1e081cfbc5c4ee0 Mon Sep 17 00:00:00 2001
From: Asif Saif Uddin <auvipy@gmail.com>
Date: Mon, 20 Dec 2021 10:55:25 +0600
Subject: [PATCH 2/4] bump to 5.0.9 in an attempt to fix the regression

---
 requirements/default.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/default.txt b/requirements/default.txt
index 0330a90e4..6710e6d0d 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -1,4 +1,4 @@
 importlib-metadata>=0.18; python_version<"3.8"
 cached_property; python_version<"3.8"
-amqp>=5.0.8,<6.0.0
+amqp>=5.0.9,<6.0.0
 vine

From c4a8c2a69f0caad080984e466a5ccdb4be068373 Mon Sep 17 00:00:00 2001
From: Asif Saif Uddin <auvipy@gmail.com>
Date: Wed, 22 Dec 2021 08:58:30 +0600
Subject: [PATCH 3/4] try restrict setuptool in CI

---
 .github/workflows/ci.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 117496a8f..0c5fab6b9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,7 +18,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: pip install --upgrade pip setuptools wheel tox tox-docker
+        run: pip install --upgrade pip 'setuptools<59.7.0' wheel tox tox-docker
       - name: Run unittest
         run: tox -v -e ${{ matrix.python-version }}-linux-unit -- -v
   #################### Integration tests ####################
@@ -47,7 +47,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: pip install --upgrade pip setuptools wheel tox tox-docker
+        run: pip install --upgrade pip 'setuptools<59.7.0' wheel tox tox-docker
       # Tox fails if a Python versions contains a hyphen, this changes "pypy-3.8" to "pypy3.8".
       - name: Determine Python version
         run: echo PYTHON_VERSION=$(echo ${{ matrix.python-version }} | sed s/-//) >> $GITHUB_ENV
@@ -74,7 +74,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: pip install --upgrade pip setuptools wheel tox tox-docker
+        run: pip install --upgrade pip 'setuptools<59.7.0' wheel tox tox-docker
       - name: Run flake8
         run: tox -v -e flake8 -- -v
       - name: Run pydocstyle

From 6ddf9409401e290e267c9c5041d92fdf5f47170d Mon Sep 17 00:00:00 2001
From: Asif Saif Uddin <auvipy@gmail.com>
Date: Wed, 22 Dec 2021 09:25:33 +0600
Subject: [PATCH 4/4] try pining setuptools (#1466)

* try pining setuptools

* try more lower version

* try 59.7.0

* try pin to setuptools==58.2.0

* try restrict setuptool in CI

* setuptools>=59.1.1,<59.7.0
---
 requirements/pkgutils.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/pkgutils.txt b/requirements/pkgutils.txt
index 0bc7d3832..8af47b455 100644
--- a/requirements/pkgutils.txt
+++ b/requirements/pkgutils.txt
@@ -1,4 +1,4 @@
-setuptools>=20.6.7
+setuptools>=59.1.1,<59.7.0
 wheel>=0.29.0
 flake8>=2.5.4
 tox>=2.3.1