From e06327a4fceb8997b2cba238e48074f403b85bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 30 Mar 2021 13:24:07 +0200
Subject: [PATCH] Allow building with setuptools_scm 6+

---
 a91c0935.patch  | 25 +++++++++++++++++++++++++
 python-tox.spec |  8 +++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 a91c0935.patch

diff --git a/a91c0935.patch b/a91c0935.patch
new file mode 100644
index 0000000..2ac4322
--- /dev/null
+++ b/a91c0935.patch
@@ -0,0 +1,25 @@
+From a91c09353a9d222178fc0e37f496aa0e6fbacc3f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 30 Mar 2021 11:46:11 +0200
+Subject: [PATCH] Allow building with setuptools_scm 6+
+
+Once again a new setuptools_scm version is available, 6.
+Lets' not change this to <7 again but allow any future version.
+If it breaks in the future, we can adapt.
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index a57d6c9f6..6aa5a1b15 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,7 +1,7 @@
+ [build-system]
+ requires = [
+     "setuptools >= 40.0.4",
+-    "setuptools_scm >= 2.0.0, <6",
++    "setuptools_scm >= 2.0.0",
+     "wheel >= 0.29.0",
+ ]
+ build-backend = 'setuptools.build_meta'
diff --git a/python-tox.spec b/python-tox.spec
index d0f9764..46c6dcc 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -13,13 +13,16 @@
 
 Name:           python-tox
 Version:        3.23.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 License:        MIT
 URL:            https://tox.readthedocs.io/
 Source0:        %{pypi_source tox}
 
+# Allow building with setuptools_scm 6+
+Patch1:         https://github.com/tox-dev/tox/commit/a91c0935.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -113,6 +116,9 @@ Obsoletes:      python3-tox < 3.21.0-2
 
 
 %changelog
+* Tue Mar 30 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-2
+- Allow building with setuptools_scm 6+
+
 * Wed Mar 17 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-1
 - Update to 3.23.0