From 7e75ae2dcd0e041d01d0f39b8c20f93f65504771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 2 Feb 2021 22:56:25 +0100
Subject: [PATCH] Update to 3.21.4

---
 .gitignore      | 27 ++-------------------------
 1799.patch      | 31 -------------------------------
 python-tox.spec | 10 +++++-----
 sources         |  2 +-
 4 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 1799.patch

diff --git a/.gitignore b/.gitignore
index c25bbb4..9f85cb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,2 @@
-/tox-1.4.2.zip
-/tox-1.6.1.tar.gz
-/tox-1.7.1.tar.gz
-/tox-1.8.1.tar.gz
-/tox-2.1.1.tar.gz
-/tox-2.3.1.tar.gz
-/tox-2.7.0.tar.gz
-/tox-2.9.1.tar.gz
-/tox-3.0.0.tar.gz
-/tox-3.4.0.tar.gz
-/tox-3.5.3.tar.gz
-/tox-3.9.0.tar.gz
-/tox-3.13.1.tar.gz
-/tox-3.13.2.tar.gz
-/tox-3.14.3.tar.gz
-/tox-3.14.6.tar.gz
-/tox-3.15.0.tar.gz
-/tox-3.15.1.tar.gz
-/tox-3.15.2.tar.gz
-/tox-3.16.1.tar.gz
-/tox-3.17.0.tar.gz
-/tox-3.18.0.tar.gz
-/tox-3.19.0.tar.gz
-/tox-3.20.0.tar.gz
-/tox-3.21.0.tar.gz
+/tox-*.tar.gz
+/tox-*/
diff --git a/1799.patch b/1799.patch
deleted file mode 100644
index 220656e..0000000
--- a/1799.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6bb2b93a09f7bd36ca06778d142fd39a02fa6fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 11 Jan 2021 13:42:43 +0100
-Subject: [PATCH] Allow building with setuptools_scm 4 and 5
-
----
- docs/changelog/1799.misc.rst | 1 +
- pyproject.toml               | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 docs/changelog/1799.misc.rst
-
-diff --git a/docs/changelog/1799.misc.rst b/docs/changelog/1799.misc.rst
-new file mode 100644
-index 000000000..640a93124
---- /dev/null
-+++ b/docs/changelog/1799.misc.rst
-@@ -0,0 +1 @@
-+Enable building tox with ``setuptools_scm`` 4 and 5 by :user:hroncok
-diff --git a/pyproject.toml b/pyproject.toml
-index 93f95d62c..a57d6c9f6 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,7 +1,7 @@
- [build-system]
- requires = [
-     "setuptools >= 40.0.4",
--    "setuptools_scm >= 2.0.0, <4",
-+    "setuptools_scm >= 2.0.0, <6",
-     "wheel >= 0.29.0",
- ]
- build-backend = 'setuptools.build_meta'
diff --git a/python-tox.spec b/python-tox.spec
index def3164..23756a5 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -12,17 +12,14 @@
 %bcond_with tests
 
 Name:           python-tox
-Version:        3.21.0
-Release:        3%{?dist}
+Version:        3.21.4
+Release:        1%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 License:        MIT
 URL:            https://tox.readthedocs.io/
 Source0:        %{pypi_source tox}
 
-# Allow building with setuptools_scm 4 and 5
-Patch1:         https://github.com/tox-dev/tox/pull/1799.patch
-
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -116,6 +113,9 @@ Obsoletes:      python3-tox < 3.21.0-2
 
 
 %changelog
+* Tue Feb 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.4-1
+- Update to 3.21.4
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index c2b34ae..839e96e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tox-3.21.0.tar.gz) = 503af239b5c762ff7e1f292d4606cda19e633d0db1681d7396b10514fd328f56c4442b28fdd1dcb88290c8cdc5da7c85b51c96705353868c56dcd73e1a18882e
+SHA512 (tox-3.21.4.tar.gz) = fc665a1e77448e80a0bad64eea2a85741ae9cec70431ca6ee495d19c1806294a76a4a6080e62303b539135c6dc4ebdb46fabcdef70408276f2ba6e11a84350f8