- Delete remove_mock.patch, that's not needed anymore, it's upstreamed
- Update to 65.5.1: * #3638: Drop a test dependency on the mock package, always use :external+python:py:mod:`unittest.mock` -- by :user:`hroncok` * #3659: Fixed REDoS vector in package_index. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=231
This commit is contained in:
Git OBS Bridge
parent
8cd1bc5162
commit
b69b4710c5
@ -1,8 +1,8 @@
|
||||
Index: setuptools-63.2.0/setuptools/_distutils/sysconfig.py
|
||||
Index: setuptools-65.5.1/setuptools/_distutils/sysconfig.py
|
||||
===================================================================
|
||||
--- setuptools-63.2.0.orig/setuptools/_distutils/sysconfig.py
|
||||
+++ setuptools-63.2.0/setuptools/_distutils/sysconfig.py
|
||||
@@ -229,9 +229,13 @@ def get_python_lib(plat_specific=0, stan
|
||||
--- setuptools-65.5.1.orig/setuptools/_distutils/sysconfig.py
|
||||
+++ setuptools-65.5.1/setuptools/_distutils/sysconfig.py
|
||||
@@ -238,9 +238,13 @@ def get_python_lib(plat_specific=0, stan
|
||||
|
||||
if os.name == "posix":
|
||||
if plat_specific or standard_lib:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 14 09:53:11 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
|
||||
|
||||
- Delete remove_mock.patch, that's not needed anymore, it's upstreamed
|
||||
- Update to 65.5.1:
|
||||
* #3638: Drop a test dependency on the mock package, always use
|
||||
:external+python:py:mod:`unittest.mock` -- by :user:`hroncok`
|
||||
* #3659: Fixed REDoS vector in package_index.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 19 09:28:07 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
|
||||
|
||||
|
||||
@ -37,15 +37,13 @@
|
||||
# in order to avoid rewriting for subpackage generator
|
||||
%define mypython python
|
||||
Name: python-setuptools%{psuffix}
|
||||
Version: 65.5.0
|
||||
Version: 65.5.1
|
||||
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
|
||||
URL: https://github.com/pypa/setuptools
|
||||
Source: https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
|
||||
Patch0: sort-for-reproducibility.patch
|
||||
# PATCH-FIX-OPENSUSE remove_mock.patch mcepl@suse.com
|
||||
Patch1: remove_mock.patch
|
||||
# PATCH-FIX-OPENSUSE fix-get-python-lib-python38.patch bsc#1204395
|
||||
Patch2: fix-get-python-lib-python38.patch
|
||||
BuildRequires: %{python_module base >= 3.7}
|
||||
@ -67,6 +65,7 @@ BuildRequires: %{python_module jaraco.path >= 3.2.0}
|
||||
BuildRequires: %{python_module pip >= 19.1}
|
||||
BuildRequires: %{python_module pip-run >= 8.8}
|
||||
BuildRequires: %{python_module pytest >= 6}
|
||||
BuildRequires: %{python_module pytest-timeout}
|
||||
BuildRequires: %{python_module pytest-xdist}
|
||||
BuildRequires: %{python_module setuptools = %{version}}
|
||||
BuildRequires: %{python_module tomli-w >= 1.0.0}
|
||||
|
||||
@ -1,145 +0,0 @@
|
||||
---
|
||||
pkg_resources/tests/test_markers.py | 2 +-
|
||||
pkg_resources/tests/test_pkg_resources.py | 5 +----
|
||||
setuptools/tests/__init__.py | 4 ++++
|
||||
setuptools/tests/test_build_clib.py | 2 +-
|
||||
setuptools/tests/test_easy_install.py | 2 +-
|
||||
setuptools/tests/test_msvc.py | 2 +-
|
||||
setuptools/tests/test_packageindex.py | 2 +-
|
||||
setuptools/tests/test_register.py | 5 +----
|
||||
setuptools/tests/test_test.py | 2 +-
|
||||
setuptools/tests/test_upload.py | 5 +----
|
||||
10 files changed, 13 insertions(+), 18 deletions(-)
|
||||
|
||||
Index: setuptools-65.5.0/pkg_resources/tests/test_markers.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/pkg_resources/tests/test_markers.py
|
||||
+++ setuptools-65.5.0/pkg_resources/tests/test_markers.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-import mock
|
||||
+from . import mock
|
||||
|
||||
from pkg_resources import evaluate_marker
|
||||
|
||||
Index: setuptools-65.5.0/pkg_resources/tests/test_pkg_resources.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/pkg_resources/tests/test_pkg_resources.py
|
||||
+++ setuptools-65.5.0/pkg_resources/tests/test_pkg_resources.py
|
||||
@@ -9,10 +9,7 @@ import stat
|
||||
import distutils.dist
|
||||
import distutils.command.install_egg_info
|
||||
|
||||
-try:
|
||||
- from unittest import mock
|
||||
-except ImportError:
|
||||
- import mock
|
||||
+from . import mock
|
||||
|
||||
from pkg_resources import (
|
||||
DistInfoDistribution, Distribution, EggInfoDistribution,
|
||||
Index: setuptools-65.5.0/setuptools/tests/__init__.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/setuptools/tests/__init__.py
|
||||
+++ setuptools-65.5.0/setuptools/tests/__init__.py
|
||||
@@ -5,6 +5,10 @@ import pytest
|
||||
|
||||
__all__ = ['fail_on_ascii']
|
||||
|
||||
+try:
|
||||
+ import mock
|
||||
+except ImportError:
|
||||
+ from unittest import mock
|
||||
|
||||
is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
|
||||
fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
|
||||
Index: setuptools-65.5.0/setuptools/tests/test_build_clib.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/setuptools/tests/test_build_clib.py
|
||||
+++ setuptools-65.5.0/setuptools/tests/test_build_clib.py
|
||||
@@ -1,6 +1,6 @@
|
||||
import pytest
|
||||
|
||||
-import mock
|
||||
+from . import mock
|
||||
from distutils.errors import DistutilsSetupError
|
||||
from setuptools.command.build_clib import build_clib
|
||||
from setuptools.dist import Distribution
|
||||
Index: setuptools-65.5.0/setuptools/tests/test_easy_install.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/setuptools/tests/test_easy_install.py
|
||||
+++ setuptools-65.5.0/setuptools/tests/test_easy_install.py
|
||||
@@ -12,7 +12,7 @@ import itertools
|
||||
import distutils.errors
|
||||
import io
|
||||
import zipfile
|
||||
-import mock
|
||||
+from . import mock
|
||||
import time
|
||||
import re
|
||||
import subprocess
|
||||
Index: setuptools-65.5.0/setuptools/tests/test_packageindex.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/setuptools/tests/test_packageindex.py
|
||||
+++ setuptools-65.5.0/setuptools/tests/test_packageindex.py
|
||||
@@ -6,7 +6,7 @@ import urllib.request
|
||||
import urllib.error
|
||||
import http.client
|
||||
|
||||
-import mock
|
||||
+from . import mock
|
||||
import pytest
|
||||
|
||||
import setuptools.package_index
|
||||
Index: setuptools-65.5.0/setuptools/tests/test_register.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/setuptools/tests/test_register.py
|
||||
+++ setuptools-65.5.0/setuptools/tests/test_register.py
|
||||
@@ -2,10 +2,7 @@ from setuptools.command.register import
|
||||
from setuptools.dist import Distribution
|
||||
from setuptools.errors import RemovedCommandError
|
||||
|
||||
-try:
|
||||
- from unittest import mock
|
||||
-except ImportError:
|
||||
- import mock
|
||||
+from . import mock
|
||||
|
||||
import pytest
|
||||
|
||||
Index: setuptools-65.5.0/setuptools/tests/test_upload.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/setuptools/tests/test_upload.py
|
||||
+++ setuptools-65.5.0/setuptools/tests/test_upload.py
|
||||
@@ -2,10 +2,7 @@ from setuptools.command.upload import up
|
||||
from setuptools.dist import Distribution
|
||||
from setuptools.errors import RemovedCommandError
|
||||
|
||||
-try:
|
||||
- from unittest import mock
|
||||
-except ImportError:
|
||||
- import mock
|
||||
+from . import mock
|
||||
|
||||
import pytest
|
||||
|
||||
Index: setuptools-65.5.0/pkg_resources/tests/__init__.py
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ setuptools-65.5.0/pkg_resources/tests/__init__.py
|
||||
@@ -0,0 +1,4 @@
|
||||
+try:
|
||||
+ import mock
|
||||
+except ImportError:
|
||||
+ from unittest import mock
|
||||
Index: setuptools-65.5.0/setuptools/tests/test_bdist_deprecations.py
|
||||
===================================================================
|
||||
--- setuptools-65.5.0.orig/setuptools/tests/test_bdist_deprecations.py
|
||||
+++ setuptools-65.5.0/setuptools/tests/test_bdist_deprecations.py
|
||||
@@ -1,6 +1,6 @@
|
||||
"""develop tests
|
||||
"""
|
||||
-import mock
|
||||
+from . import mock
|
||||
import sys
|
||||
|
||||
import pytest
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17
|
||||
size 2616463
|
||||
3
setuptools-65.5.1.tar.gz
Normal file
3
setuptools-65.5.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f
|
||||
size 2616576
|
||||
Loading…
Reference in New Issue
Block a user