-
Notifications
You must be signed in to change notification settings - Fork 162
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Please note the change in 50.0.0: "Setuptools overrides the stdlib distutils on import" and the workaround: "If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior." v50.0.1 ------- * #2357: Restored Python 3.5 support in distutils.util for missing `subprocess._optim_args_from_interpreter_flags`. * #2358: Restored AIX support on Python 3.8 and earlier. * #2361: Add Python 3.10 support to _distutils_hack. Get the 'Loader' abstract class from importlib.abc rather than importlib.util.abc (alias removed in Python 3.10). v50.0.0 ------- * #2232: Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed. * #2334: In MSVC module, refine text in error message. v49.6.0 ------- * #2129: In pkg_resources, no longer detect any pathname ending in .egg as a Python egg. Now the path must be an unpacked egg or a zip file. v49.5.0 ------- * #2306: When running as a PEP 517 backend, setuptools does not try to install ``setup_requires`` itself. They are reported as build requirements for the frontend to install. v49.4.0 ------- * #2310: Updated vendored packaging version to 20.4. v49.3.2 ------- * #2300: Improve the ``safe_version`` function documentation * #2297: Once again, in stubs prefer exec_module to the deprecated load_module. v49.3.1 ------- * #2316: Removed warning when ``distutils`` is imported before ``setuptools`` when ``distutils`` replacement is not enabled. v49.3.0 ------- * #2259: Setuptools now provides a .pth file (except for editable installs of setuptools) to the target environment to ensure that when enabled, the setuptools-provided distutils is preferred before setuptools has been imported (and even if setuptools is never imported). Honors the SETUPTOOLS_USE_DISTUTILS environment variable. v49.2.1 ------- * #2257: Fixed two flaws in distutils._msvccompiler.MSVCCompiler.spawn. v49.2.0 ------- * #2230: Now warn the user when setuptools is imported after distutils modules have been loaded (exempting PyPy for 3.6), directing the users of packages to import setuptools first. v49.1.3 ------- * #2212: (Distutils) Allow spawn to accept environment. Avoid monkey-patching global state. * #2249: Fix extension loading technique in stubs. v49.1.2 ------- * #2232: In preparation for re-enabling a local copy of distutils, Setuptools now honors an environment variable, SETUPTOOLS_USE_DISTUTILS. If set to 'stdlib' (current default), distutils will be used from the standard library. If set to 'local' (default in a imminent backward-incompatible release), the local copy of distutils will be used. v49.1.1 ------- * #2094: Removed pkg_resources.py2_warn module, which is no longer reachable. v49.0.1 ------- * #2228: Applied fix for pypa/distutils#3, restoring expectation that spawn will raise a DistutilsExecError when attempting to execute a missing file. v49.1.0 ------- * #2228: Disabled distutils adoption for now while emergent issues are addressed. v49.0.0 ------- * #2165: Setuptools no longer installs a site.py file during easy_install or develop installs. As a result, .eggs on PYTHONPATH will no longer take precedence over other packages on sys.path. If this issue affects your production environment, please reach out to the maintainers at #2165. * #2137: Removed (private) pkg_resources.RequirementParseError, now replaced by packaging.requirements.InvalidRequirement. Kept the name for compatibility, but users should catch InvalidRequirement instead. * #2180: Update vendored packaging in pkg_resources to 19.2. * #2199: Fix exception causes all over the codebase by using ``raise new_exception from old_exception``
- Loading branch information
Showing
5 changed files
with
244 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| $NetBSD: distinfo,v 1.156 2020/08/31 23:06:02 wiz Exp $ | ||
| $NetBSD: distinfo,v 1.157 2020/09/02 21:42:18 wiz Exp $ | ||
|
|
||
| SHA1 (setuptools-47.3.2.zip) = 3fafd8bd0bd38ca7583b42c9a44c9ba562af4be6 | ||
| RMD160 (setuptools-47.3.2.zip) = 0fa7da65cf1f562f32a91dc08e5999ace1b44c8d | ||
| SHA512 (setuptools-47.3.2.zip) = 9efe296b08f98a3b38e0650bf67f6ef6f6d2f41b88c2646c2f3e45ba4ab76e2171bd220979c3002cf08cf0d2dab135b13d0a38181102ed3f579ca88f84f59038 | ||
| Size (setuptools-47.3.2.zip) = 869998 bytes | ||
| SHA1 (setuptools-50.0.1.zip) = 38c697fac7de77e14e29ff594bc739c03a101060 | ||
| RMD160 (setuptools-50.0.1.zip) = 468f2969b76a583a34c75a0fb843b69b60658db9 | ||
| SHA512 (setuptools-50.0.1.zip) = 8d8d008b586fe3782aea4a8ca109904be99490fc7bed1c8161f062d2c4594a94632c4f01b2933b5150e9f6b1336513e2c106e0a4a7a1a9a35ccb5257b7eb949a | ||
| Size (setuptools-50.0.1.zip) = 2167767 bytes | ||
| SHA1 (patch-setup.py) = dd94c9a4e15b8b0dc428515f73369ed168b8c7b2 | ||
| SHA1 (patch-setuptools___distutils_sysconfig.py) = a7b51250f81fcdb1263874f13be9e05daa19d956 | ||
| SHA1 (patch-setuptools___distutils_unixccompiler.py) = 0458b62ffed862c506c9181ed851b6a13f53aa30 |
28 changes: 28 additions & 0 deletions
28
devel/py-setuptools/patches/patch-setuptools___distutils_sysconfig.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| $NetBSD: patch-setuptools___distutils_sysconfig.py,v 1.1 2020/09/02 21:42:18 wiz Exp $ | ||
|
|
||
| Remove _multiarch from config path (differs across platforms). | ||
| Simplify _sysconfigdata to include only platform name. | ||
|
|
||
| --- setuptools/_distutils/sysconfig.py.orig 2020-09-01 17:50:24.000000000 +0000 | ||
| +++ setuptools/_distutils/sysconfig.py | ||
| @@ -274,8 +274,6 @@ def get_makefile_filename(): | ||
| return os.path.join(_sys_home or project_base, "Makefile") | ||
| lib_dir = get_python_lib(plat_specific=0, standard_lib=1) | ||
| config_file = 'config-{}{}'.format(get_python_version(), build_flags) | ||
| - if hasattr(sys.implementation, '_multiarch'): | ||
| - config_file += '-%s' % sys.implementation._multiarch | ||
| return os.path.join(lib_dir, config_file, 'Makefile') | ||
|
|
||
|
|
||
| @@ -451,10 +449,8 @@ def _init_posix(): | ||
| """Initialize the module as appropriate for POSIX systems.""" | ||
| # _sysconfigdata is generated at build time, see the sysconfig module | ||
| name = os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', | ||
| - '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( | ||
| - abi=sys.abiflags, | ||
| + '_sysconfigdata_{platform}'.format( | ||
| platform=sys.platform, | ||
| - multiarch=getattr(sys.implementation, '_multiarch', ''), | ||
| )) | ||
| try: | ||
| _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) |
31 changes: 31 additions & 0 deletions
31
devel/py-setuptools/patches/patch-setuptools___distutils_unixccompiler.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| $NetBSD: patch-setuptools___distutils_unixccompiler.py,v 1.1 2020/09/02 21:42:18 wiz Exp $ | ||
|
|
||
| Do not force RUNPATH vs RPATH, trust the compiler to know what the | ||
| platform wants. | ||
|
|
||
| --- setuptools/_distutils/unixccompiler.py.orig 2020-09-01 17:50:24.000000000 +0000 | ||
| +++ setuptools/_distutils/unixccompiler.py | ||
| @@ -242,22 +242,7 @@ class UnixCCompiler(CCompiler): | ||
| return ["-Wl,+s", "-L" + dir] | ||
| return ["+s", "-L" + dir] | ||
| else: | ||
| - if self._is_gcc(compiler): | ||
| - # gcc on non-GNU systems does not need -Wl, but can | ||
| - # use it anyway. Since distutils has always passed in | ||
| - # -Wl whenever gcc was used in the past it is probably | ||
| - # safest to keep doing so. | ||
| - if sysconfig.get_config_var("GNULD") == "yes": | ||
| - # GNU ld needs an extra option to get a RUNPATH | ||
| - # instead of just an RPATH. | ||
| - return "-Wl,--enable-new-dtags,-R" + dir | ||
| - else: | ||
| - return "-Wl,-R" + dir | ||
| - else: | ||
| - # No idea how --enable-new-dtags would be passed on to | ||
| - # ld if this system was using GNU ld. Don't know if a | ||
| - # system like this even exists. | ||
| - return "-R" + dir | ||
| + return "-Wl,-R" + dir | ||
|
|
||
| def library_option(self, lib): | ||
| return "-l" + lib |