15
0

Accepting request 1084684 from devel:languages:python

- Testing must be single-spec as well. (forwarded request 1084683 from mcepl)

OBS-URL: https://build.opensuse.org/request/show/1084684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-setuptools?expand=0&rev=76
This commit is contained in:
2023-05-30 20:01:57 +00:00
committed by Git OBS Bridge
6 changed files with 85 additions and 30 deletions

View File

@@ -1,3 +1,26 @@
-------------------------------------------------------------------
Thu May 4 12:50:17 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Testing must be single-spec as well.
-------------------------------------------------------------------
Wed May 3 02:23:58 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 67.7.2:
* #3902: Fixed wrong URLs used in warnings and logs.
* #3898: Fixes setuptools.dist:invalid_unless_false when value is false
dont raise error
* #3849: Overhaul warning system for better visibility.
* #3884: Add a stacklevel parameter to warnings.warn() to provide more
information to the user.
- Add patch use-tarfile-extraction_filter.patch:
* Set an extraction_filter to avoid a warning.
-------------------------------------------------------------------
Fri Apr 21 12:33:50 UTC 2023 - Dirk Müller <dmueller@suse.com>
- add sle15_python_module_pythons (jsc#PED-68)
-------------------------------------------------------------------
Sun Apr 16 08:13:23 UTC 2023 - Dirk Müller <dmueller@suse.com>
@@ -9,6 +32,11 @@ Sun Apr 16 08:13:23 UTC 2023 - Dirk Müller <dmueller@suse.com>
* This should fix default license patterns when
``pyproject.toml`` is used.
-------------------------------------------------------------------
Sun Mar 26 06:36:38 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Refresh sort-for-reproducibility.patch
-------------------------------------------------------------------
Thu Mar 9 05:04:25 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>

View File

@@ -36,8 +36,9 @@
# in order to avoid rewriting for subpackage generator
%define mypython python
%{?sle15_python_module_pythons}
Name: python-setuptools%{psuffix}
Version: 67.6.1
Version: 67.7.2
Release: 0
Summary: Download, build, install, upgrade, and uninstall Python packages
License: Apache-2.0 AND MIT AND BSD-2-Clause AND Python-2.0
@@ -46,6 +47,8 @@ Source: https://files.pythonhosted.org/packages/source/s/setuptools/setu
Patch0: sort-for-reproducibility.patch
# PATCH-FIX-OPENSUSE fix-get-python-lib-python38.patch bsc#1204395
Patch2: fix-get-python-lib-python38.patch
# PATCH-FIX-UPSTREAM gh#pypa/setuptools#3917
Patch3: use-tarfile-extraction_filter.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -68,10 +71,10 @@ BuildRequires: %{python_module pytest >= 6}
BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module pytest-xdist}
BuildRequires: %{python_module setuptools = %{version}}
BuildRequires: %{python_module setuptools-wheel = %{version}}
BuildRequires: %{python_module tomli-w >= 1.0.0}
BuildRequires: %{python_module virtualenv >= 13.0.0}
BuildRequires: %{python_module wheel}
BuildRequires: python3-setuptools-wheel = %{version}
%endif
%if 0%{?suse_version} || 0%{?fedora_version} >= 24
Recommends: ca-certificates-mozilla
@@ -108,7 +111,7 @@ especially ones that have dependencies on other packages.
%check
%if %{with test}
export PRE_BUILT_SETUPTOOLS_WHEEL=%{python3_sitelib}/../wheels/setuptools-%{version}-py2.py3-none-any.whl
%python_expand export PRE_BUILT_SETUPTOOLS_WHEEL=%{$python_sitelib}/../wheels/setuptools-%{version}-py2.py3-none-any.whl
export LANG=en_US.UTF-8
# tests need imports from local source dir
export PYTHONPATH=$(pwd)

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:257de92a9d50a60b8e22abfcbb771571fde0dbf3ec234463212027a4eeecbe9a
size 2486256

BIN
setuptools-67.7.2.tar.gz LFS Normal file

Binary file not shown.

View File

@@ -1,7 +1,13 @@
Index: setuptools-63.1.0/setuptools/command/easy_install.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/command/easy_install.py
+++ setuptools-63.1.0/setuptools/command/easy_install.py
---
setuptools/command/easy_install.py | 2 +-
setuptools/command/egg_info.py | 2 +-
setuptools/dist.py | 2 +-
setuptools/tests/test_egg_info.py | 2 +-
setuptools/tests/test_wheel.py | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -419,7 +419,7 @@ class easy_install(Command):
for spec in self.args:
self.easy_install(spec, not self.no_deps)
@@ -11,11 +17,9 @@ Index: setuptools-63.1.0/setuptools/command/easy_install.py
if self.root: # strip any package prefix
root_len = len(self.root)
for counter in range(len(outputs)):
Index: setuptools-63.1.0/setuptools/command/egg_info.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/command/egg_info.py
+++ setuptools-63.1.0/setuptools/command/egg_info.py
@@ -683,7 +683,7 @@ def _write_requirements(stream, reqs):
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -694,7 +694,7 @@ def _write_requirements(stream, reqs):
def append_cr(line):
return line + '\n'
@@ -24,11 +28,9 @@ Index: setuptools-63.1.0/setuptools/command/egg_info.py
stream.writelines(lines)
Index: setuptools-63.1.0/setuptools/dist.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/dist.py
+++ setuptools-63.1.0/setuptools/dist.py
@@ -222,7 +222,7 @@ def write_pkg_file(self, file): # noqa:
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -221,7 +221,7 @@ def write_pkg_file(self, file): # noqa:
if self.long_description_content_type:
write_field('Description-Content-Type', self.long_description_content_type)
if self.provides_extras:
@@ -37,11 +39,9 @@ Index: setuptools-63.1.0/setuptools/dist.py
write_field('Provides-Extra', extra)
self._write_list(file, 'License-File', self.license_files or [])
Index: setuptools-63.1.0/setuptools/tests/test_egg_info.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_egg_info.py
+++ setuptools-63.1.0/setuptools/tests/test_egg_info.py
@@ -297,8 +297,8 @@ class TestEggInfo:
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -304,8 +304,8 @@ class TestEggInfo:
wheel>=0.5
pytest
@@ -51,11 +51,9 @@ Index: setuptools-63.1.0/setuptools/tests/test_egg_info.py
''',
'''
Index: setuptools-63.1.0/setuptools/tests/test_wheel.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_wheel.py
+++ setuptools-63.1.0/setuptools/tests/test_wheel.py
@@ -425,30 +425,30 @@ WHEEL_INSTALL_TESTS = (
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -423,30 +423,30 @@ WHEEL_INSTALL_TESTS = (
dict(
id='requires_ensure_order',
install_requires='''

View File

@@ -0,0 +1,26 @@
From 788a7601c88db28435a70e5bb17e6eba23a31e4c Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Wed, 3 May 2023 12:02:19 +1000
Subject: [PATCH] tests: Add extraction_filter for tarfile
Python 3.12, and earlier via security backports now issue an
DeprecationWarning when calling tarfile.extractall without an extraction
filter set. Since the only place we've called extractall is literally
right after we've created the archive, use a fully trusted filter. This
can be replaced with a filter argument to extractall in future.
---
setuptools/tests/test_easy_install.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index bca86066ad..edc9af8252 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -615,6 +615,7 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg):
foobar_1_dir = os.path.join(temp_dir, 'foo.bar-0.1')
os.mkdir(foobar_1_dir)
with tarfile.open(foobar_1_archive) as tf:
+ tf.extraction_filter = (lambda member, path: member)
tf.extractall(foobar_1_dir)
sys.path.insert(1, foobar_1_dir)