From 4883107de7891d3953aeada1718b78b890c19b22 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 2 Nov 2021 01:12:42 -0600 Subject: [PATCH 1/6] Add requirement for compatible setuptools version. In order to avoid a recursive dependency issue when parsing the aiohttp version during install setuptools needs: https://github.com/pypa/setuptools/commit/c457e68319555b7266e5e0802946c5b1b63e4d61 This implies we need setuptools 46.4.0 or newer. --- CHANGES/6205.bugfix | 1 + README.rst | 1 + pyproject.toml | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 CHANGES/6205.bugfix diff --git a/CHANGES/6205.bugfix b/CHANGES/6205.bugfix new file mode 100644 index 00000000000..eaf5712cead --- /dev/null +++ b/CHANGES/6205.bugfix @@ -0,0 +1 @@ +Added requirement for compatible ``setuptools`` version. diff --git a/README.rst b/README.rst index 143c3a59baf..d67455dfe5d 100644 --- a/README.rst +++ b/README.rst @@ -163,6 +163,7 @@ Requirements ============ - Python >= 3.7 +- setuptools >= 46.4.0 - async-timeout_ - charset-normalizer_ - multidict_ diff --git a/pyproject.toml b/pyproject.toml index acccf615c8a..e68da08b00c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,9 @@ +[build-system] +requires = [ + "setuptools>=46.4.0", +] +build-backend = "setuptools.build_meta" + [tool.towncrier] package = "aiohttp" filename = "CHANGES.rst" From ec24eb0c1dcaec61a6fd41b03ac83c1e413be8ef Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 2 Nov 2021 05:39:25 -0600 Subject: [PATCH 2/6] Update CHANGES/6205.bugfix Co-authored-by: Sviatoslav Sydorenko --- CHANGES/6205.bugfix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES/6205.bugfix b/CHANGES/6205.bugfix index eaf5712cead..1b65f11a625 100644 --- a/CHANGES/6205.bugfix +++ b/CHANGES/6205.bugfix @@ -1 +1,2 @@ -Added requirement for compatible ``setuptools`` version. +Declared the minimum required version of ``setuptools`` in the :pep:`517` +configuration file -- :user:`jameshilliard`. From 4fe34bb08a40437ec90c314ba2cfe00b8f74654f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 2 Nov 2021 05:52:36 -0600 Subject: [PATCH 3/6] Update pyproject.toml Co-authored-by: Sviatoslav Sydorenko --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e68da08b00c..262623fecd5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools>=46.4.0", + "setuptools >= 46.4.0", ] build-backend = "setuptools.build_meta" From 4b97748c1a8f52c4f234e640312872bd18ff340a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 2 Nov 2021 05:53:48 -0600 Subject: [PATCH 4/6] Remove setuptools requirement from readme. --- README.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/README.rst b/README.rst index d67455dfe5d..143c3a59baf 100644 --- a/README.rst +++ b/README.rst @@ -163,7 +163,6 @@ Requirements ============ - Python >= 3.7 -- setuptools >= 46.4.0 - async-timeout_ - charset-normalizer_ - multidict_ From 109f826e89b46310a36eb75948a0a13704a791f4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 2 Nov 2021 05:56:35 -0600 Subject: [PATCH 5/6] Change bugfix to misc. --- CHANGES/{6205.bugfix => 6205.misc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CHANGES/{6205.bugfix => 6205.misc} (100%) diff --git a/CHANGES/6205.bugfix b/CHANGES/6205.misc similarity index 100% rename from CHANGES/6205.bugfix rename to CHANGES/6205.misc From 2cd7d89e13f399ecc161cc7eaa643f3deb3c1058 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 2 Nov 2021 13:00:45 +0100 Subject: [PATCH 6/6] Make the change note more specific --- CHANGES/6205.misc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES/6205.misc b/CHANGES/6205.misc index 1b65f11a625..15b60ce0930 100644 --- a/CHANGES/6205.misc +++ b/CHANGES/6205.misc @@ -1,2 +1,2 @@ -Declared the minimum required version of ``setuptools`` in the :pep:`517` -configuration file -- :user:`jameshilliard`. +Declared the minimum required version of ``setuptools`` v46.4.0 +in the :pep:`517` configuration file -- :user:`jameshilliard`.