From 89d818e031a5488c7804b06c195ab064d4cc19ea Mon Sep 17 00:00:00 2001 From: yangbo Date: Thu, 5 Jan 2023 18:58:44 +0800 Subject: [PATCH] Merge pull request #2124 from pypa/release-20.4.7 Signed-off-by: yangbo --- backport-0001-release-20.4.7.patch | 40 ++++++++++++++++++++++++++++++ python-virtualenv.spec | 10 +++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 backport-0001-release-20.4.7.patch diff --git a/backport-0001-release-20.4.7.patch b/backport-0001-release-20.4.7.patch new file mode 100644 index 0000000..9019326 --- /dev/null +++ b/backport-0001-release-20.4.7.patch @@ -0,0 +1,40 @@ +From a144c3cec99349985f448ed01b256421ab5995b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= +Date: Mon, 24 May 2021 18:39:05 +0100 +Subject: [PATCH] release 20.4.7 + +--- + docs/changelog.rst | 8 ++++++++ + docs/changelog/2123.bugfix.rst | 1 - + 2 files changed, 8 insertions(+), 1 deletion(-) + delete mode 100644 docs/changelog/2123.bugfix.rst + +diff --git a/docs/changelog.rst b/docs/changelog.rst +index 97d8d05..504ef34 100644 +--- a/docs/changelog.rst ++++ b/docs/changelog.rst +@@ -5,6 +5,14 @@ Release History + + .. towncrier release notes start + ++v20.4.7 (2021-05-24) ++-------------------- ++ ++Bugfixes - 20.4.7 ++~~~~~~~~~~~~~~~~~ ++- Upgrade embedded pip to ``21.1.2`` and setuptools to ``57.0.0`` - by :user:`gaborbernat`. (`#2123 `_) ++ ++ + v20.4.6 (2021-05-05) + -------------------- + +diff --git a/docs/changelog/2123.bugfix.rst b/docs/changelog/2123.bugfix.rst +deleted file mode 100644 +index 98a5b02..0000000 +--- a/docs/changelog/2123.bugfix.rst ++++ /dev/null +@@ -1 +0,0 @@ +-Upgrade embedded pip to ``21.1.2`` and setuptools to ``57.0.0`` - by :user:`gaborbernat`. +-- +2.39.0.windows.2 + diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 4e7bc27..f6ecc41 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -1,7 +1,7 @@ %global srcname virtualenv Name: python-%{srcname} Version: 20.4.7 -Release: 1 +Release: 2 Summary: A tool to create isolated Python environments License: MIT URL: http://pypi.python.org/pypi/virtualenv @@ -11,6 +11,8 @@ BuildArch: noarch BuildRequires: python3-appdirs python3-distlib python3-filelock python3-six BuildRequires: python3-devel python3-setuptools_scm python3-setuptools +Patch6000: backport-0001-release-20.4.7.patch + %description Virtualenv is a tool to create isolated Python environments. Since Python 3.3, a subset of it has been integrated into the standard library under @@ -68,6 +70,12 @@ Tools that support for python2.6 virtual environments with python3. %{python3_sitelib}/virtualenv/seed/wheels/embed/*.whl %changelog +* Thu Jan 5 2023 yangbo - 20.4.7-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:Merge pull request #2124 from pypa/release-20.4.7 + * Thu Dec 09 2021 shixuantong - 20.4.7-1 - update version to 20.4.7 -- Gitee