- Add fix-get-python-lib-python38.patch to fix get_python_lib() method in

python3.8 bsc#1204395
- Update to version 65.5.0:
  * #3624: Fixed editable install for multi-module/no-package src-layout
    projects.
  * #3626: Minor refactorings to support distutils using stdlib logging module.
  * #3419: Updated the example version numbers to be compliant with PEP-440 on
    the "Specifying Your Project’s Version" page of the user guide.
  * #3569: Improved information about conflicting entries in the current
    working directory and editable install (in documentation and as an
    informational warning).
  * #3576: Updated version of validate_pyproject.
- v65.4.1
  * #3613: Fixed encoding errors in expand.StaticModule when system default
    encoding doesn't match expectations for source files.
  * #3617: Merge with pypa/distutils@6852b20 including fix for
    pypa/distutils#181.
- v65.4.0
  * #3609: Merge with pypa/distutils@d82d926 including support for
    DIST_EXTRA_CONFIG in pypa/distutils#177.
- v65.3.0
  * #3547: Stop ConfigDiscovery.analyse_name from splatting the
    Distribution.name attribute -- by :user:`jeamland`
  * #3554: Changed requires to requests in the pyproject.toml example in the
    :doc:`Dependency management section of the Quickstart guide
    <userguide/quickstart>` -- by :user:`mfbutner`
  * #3561: Fixed accidental name matching in editable hooks.
- v65.2.0
  * #3553: Sync with pypa/distutils@22b9bcf, including fixed cross-compiling
    support and removing deprecation warning per pypa/distutils#169.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=227
This commit is contained in:
Daniel Garcia 2022-10-19 07:45:56 +00:00 committed by Git OBS Bridge
parent 2ec3700a89
commit c0badd16dd
6 changed files with 193 additions and 46 deletions

View File

@ -0,0 +1,21 @@
Index: setuptools-63.2.0/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
if os.name == "posix":
if plat_specific or standard_lib:
- # Platform-specific modules (any module from a non-pure-Python
- # module distribution) or standard Python library modules.
- libdir = getattr(sys, "platlibdir", "lib")
+ # Python 3.8 doesn't have sys.platlibdir
+ if sys.version_info < (3, 9):
+ libdir = get_config_var("platsubdir") or "lib"
+ else:
+ # Platform-specific modules (any module from a non-pure-Python
+ # module distribution) or standard Python library modules.
+ libdir = getattr(sys, "platlibdir", "lib")
else:
# Pure Python
libdir = "lib"

View File

@ -1,3 +1,140 @@
-------------------------------------------------------------------
Wed Oct 19 07:04:34 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
- Add fix-get-python-lib-python38.patch to fix get_python_lib() method in
python3.8 bsc#1204395
- Update to version 65.5.0:
* #3624: Fixed editable install for multi-module/no-package src-layout
projects.
* #3626: Minor refactorings to support distutils using stdlib logging module.
* #3419: Updated the example version numbers to be compliant with PEP-440 on
the "Specifying Your Projects Version" page of the user guide.
* #3569: Improved information about conflicting entries in the current
working directory and editable install (in documentation and as an
informational warning).
* #3576: Updated version of validate_pyproject.
- v65.4.1
* #3613: Fixed encoding errors in expand.StaticModule when system default
encoding doesn't match expectations for source files.
* #3617: Merge with pypa/distutils@6852b20 including fix for
pypa/distutils#181.
- v65.4.0
* #3609: Merge with pypa/distutils@d82d926 including support for
DIST_EXTRA_CONFIG in pypa/distutils#177.
- v65.3.0
* #3547: Stop ConfigDiscovery.analyse_name from splatting the
Distribution.name attribute -- by :user:`jeamland`
* #3554: Changed requires to requests in the pyproject.toml example in the
:doc:`Dependency management section of the Quickstart guide
<userguide/quickstart>` -- by :user:`mfbutner`
* #3561: Fixed accidental name matching in editable hooks.
- v65.2.0
* #3553: Sync with pypa/distutils@22b9bcf, including fixed cross-compiling
support and removing deprecation warning per pypa/distutils#169.
- v65.1.1
* #3551: Avoided circular imports in meta path finder for editable installs
when a missing module has the same name as its parent.
- v65.1.0
* #3536: Remove monkeypatching of msvc9compiler.
* #3538: Corrected documentation on how to use the legacy-editable mode.
- v65.0.2
* #3505: Restored distutils msvccompiler and msvc9compiler modules and marked
as deprecated (pypa/distutils@c802880).
- v65.0.1
* #3529: Added clarification to :doc:`/userguide/quickstart` about support to
setup.py.
* #3526: Fixed backward compatibility of editable installs and custom
build_ext commands inheriting directly from distutils.
* #3528: Fixed buid_meta.prepare_metadata_for_build_wheel when given
metadata_directory is ".".
- v65.0.0
* #3505: Removed 'msvccompiler' and 'msvc9compiler' modules from distutils.
* #3521: Remove bdist_msi and bdist_wininst commands, which have been
deprecated since Python 3.9. Use older Setuptools for these behaviors if
needed.
* #3519: Changed the note in keywords documentation regarding editable
installations to specify which setuptools version require a minimal
setup.py file or not.
- v64.0.3
* #3515: Fixed "inline" file copying for editable installations and optional
extensions.
* #3517: Fixed editable_wheel to ensure other commands are finalized before
using them. This should prevent errors with plugins trying to use different
commands or reinitializing them.
* #3517: Augmented filter to prevent transient/temporary source files from
being considered package_data or data_files.
- v64.0.2
* #3506: Suppress errors in custom build_py implementations when running
editable installs in favor of a warning indicating what is the most
appropriate migration path. This is a transitional measure. Errors might be
raised in future versions of setuptools.
* #3512: Added capability of handling namespace packages created
accidentally/purposefully via discovery configuration during editable
installs. This should emulate the behaviour of a non-editable installation.
- v64.0.1
* #3497: Fixed editable_wheel for legacy namespaces.
* #3502: Fixed issue with editable install and single module distributions.
* #3503: Added filter to ignore external .egg-info files in manifest.
* Some plugins might rely on the fact that the .egg-info directory is
produced inside the project dir, which may not be the case in editable
installs (the .egg-info directory is produced inside the metadata directory
given by the build frontend via PEP 660 hooks).
- v64.0.0
* #3380: Passing some types of parameters via --global-option to setuptools
PEP 517/PEP 660 backend is now considered deprecated. The user can pass the
same arbitrary parameter via --build-option (--global-option is now
reserved for flags like --verbose or --quiet).
* Both --build-option and --global-option are supported as a transitional
effort (a.k.a. "escape hatch"). In the future a proper list of allowed
config_settings may be created.
* #3265: Added implementation for editable install hooks (PEP 660).
* #3380: Improved the handling of the config_settings parameter in both PEP
517 and PEP 660 interfaces:
* #3392: Exposed get_output_mapping() from build_py and build_ext
subcommands. This interface is reserved for the use of setuptools
Extensions and third part packages are explicitly disallowed to calling it.
However, any implementation overwriting build_py or build_ext are required
to honour this interface.
* #3412: Added ability of collecting source files from custom build
sub-commands to sdist. This allows plugins and customization scripts to
automatically add required source files in the source distribution.
* #3414: Users can temporarily specify an environment variable
SETUPTOOLS_ENABLE_FEATURES=legacy-editable as a escape hatch for the PEP
660 behavior. This setting is transitional and may be removed in the
future.
* #3484: Added transient compat mode to editable installs. This more will be
temporarily available (to facilitate the transition period) for those that
want to emulate the behavior of the develop command (in terms of what is
added to sys.path). This mode is provided "as is", with limited support,
and will be removed in future versions of setuptools.
* #3414: Updated :doc:`Development Mode </userguide/development_mode>` to
reflect on the implementation of PEP 660.
- v63.4.3
* #3496: Update to pypa/distutils@b65aa40 including more robust support for
library/include dir handling in msvccompiler (pypa/distutils#153) and test
suite improvements.
- v63.4.2
* #3453: Bump vendored version of :pypi:`pyparsing` to 3.0.9.
* #3481: Add warning for potential install_requires and extras_require
misconfiguration in setup.cfg
* #3487: Modified pyproject.toml validation exception handling to make
relevant debugging information easier to spot.
- v63.4.1
* #3482: Sync with pypa/distutils@274758f1c02048d295efdbc13d2f88d9923547f8,
restoring compatibility shim in bdist.format_commands.
- v63.4.0
* #2971: upload_docs command is deprecated once again.
* #3443: Installed sphinx-hoverxref extension to show tooltips on internal an
external references. -- by :user:`humitos`
* #3444: Installed sphinx-notfound-page extension to generate nice 404 pages.
-- by :user:`humitos`
* #3480: Merge with pypa/distutils@c397f4c
- v63.3.0
* #3475: Merge with pypa/distutils@129480b, including substantial delinting
and cleanup, some refactoring around compiler logic, better messaging in
cygwincompiler (pypa/distutils#161).
-------------------------------------------------------------------
Sat Jul 16 15:54:03 UTC 2022 - Arun Persaud <arun@gmx.de>

View File

@ -38,7 +38,7 @@
# in order to avoid rewriting for subpackage generator
%define mypython python
Name: python-setuptools%{psuffix}
Version: 63.2.0
Version: 65.5.0
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
@ -47,6 +47,8 @@ Source: https://files.pythonhosted.org/packages/source/s/setuptools/setu
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}
BuildRequires: fdupes
BuildRequires: python-rpm-macros

View File

@ -11,20 +11,20 @@
setuptools/tests/test_upload.py | 5 +----
10 files changed, 13 insertions(+), 18 deletions(-)
Index: setuptools-63.1.0/pkg_resources/tests/test_markers.py
Index: setuptools-65.5.0/pkg_resources/tests/test_markers.py
===================================================================
--- setuptools-63.1.0.orig/pkg_resources/tests/test_markers.py
+++ setuptools-63.1.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-63.1.0/pkg_resources/tests/test_pkg_resources.py
Index: setuptools-65.5.0/pkg_resources/tests/test_pkg_resources.py
===================================================================
--- setuptools-63.1.0.orig/pkg_resources/tests/test_pkg_resources.py
+++ setuptools-63.1.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
@ -37,10 +37,10 @@ Index: setuptools-63.1.0/pkg_resources/tests/test_pkg_resources.py
from pkg_resources import (
DistInfoDistribution, Distribution, EggInfoDistribution,
Index: setuptools-63.1.0/setuptools/tests/__init__.py
Index: setuptools-65.5.0/setuptools/tests/__init__.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/__init__.py
+++ setuptools-63.1.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']
@ -52,10 +52,10 @@ Index: setuptools-63.1.0/setuptools/tests/__init__.py
is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
Index: setuptools-63.1.0/setuptools/tests/test_build_clib.py
Index: setuptools-65.5.0/setuptools/tests/test_build_clib.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_build_clib.py
+++ setuptools-63.1.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
@ -64,10 +64,10 @@ Index: setuptools-63.1.0/setuptools/tests/test_build_clib.py
from distutils.errors import DistutilsSetupError
from setuptools.command.build_clib import build_clib
from setuptools.dist import Distribution
Index: setuptools-63.1.0/setuptools/tests/test_easy_install.py
Index: setuptools-65.5.0/setuptools/tests/test_easy_install.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_easy_install.py
+++ setuptools-63.1.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
@ -77,23 +77,10 @@ Index: setuptools-63.1.0/setuptools/tests/test_easy_install.py
import time
import re
import subprocess
Index: setuptools-63.1.0/setuptools/tests/test_msvc.py
Index: setuptools-65.5.0/setuptools/tests/test_packageindex.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_msvc.py
+++ setuptools-63.1.0/setuptools/tests/test_msvc.py
@@ -5,7 +5,7 @@ Tests for msvc support module.
import os
import contextlib
import distutils.errors
-import mock
+from . import mock
import pytest
Index: setuptools-63.1.0/setuptools/tests/test_packageindex.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_packageindex.py
+++ setuptools-63.1.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
@ -103,10 +90,10 @@ Index: setuptools-63.1.0/setuptools/tests/test_packageindex.py
import pytest
import setuptools.package_index
Index: setuptools-63.1.0/setuptools/tests/test_register.py
Index: setuptools-65.5.0/setuptools/tests/test_register.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_register.py
+++ setuptools-63.1.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
@ -119,10 +106,10 @@ Index: setuptools-63.1.0/setuptools/tests/test_register.py
import pytest
Index: setuptools-63.1.0/setuptools/tests/test_upload.py
Index: setuptools-65.5.0/setuptools/tests/test_upload.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_upload.py
+++ setuptools-63.1.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
@ -135,19 +122,19 @@ Index: setuptools-63.1.0/setuptools/tests/test_upload.py
import pytest
Index: setuptools-63.1.0/pkg_resources/tests/__init__.py
Index: setuptools-65.5.0/pkg_resources/tests/__init__.py
===================================================================
--- /dev/null
+++ setuptools-63.1.0/pkg_resources/tests/__init__.py
+++ setuptools-65.5.0/pkg_resources/tests/__init__.py
@@ -0,0 +1,4 @@
+try:
+ import mock
+except ImportError:
+ from unittest import mock
Index: setuptools-63.1.0/setuptools/tests/test_bdist_deprecations.py
Index: setuptools-65.5.0/setuptools/tests/test_bdist_deprecations.py
===================================================================
--- setuptools-63.1.0.orig/setuptools/tests/test_bdist_deprecations.py
+++ setuptools-63.1.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
"""

View File

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

3
setuptools-65.5.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17
size 2616463