gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python312Packages.setuptools: 69.2.0 -> 69.5.1

Browse Source 
https://github.com/pypa/setuptools/blob/v69.5.1/NEWS.rst
This commit is contained in:
Martin Weinelt
2024-04-22 13:59:38 +02:00
parent 10496cd886
commit bbca5dc990
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/setuptools/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "setuptools";
version = "69.2.0";
version = "69.5.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "pypa";
repo = "setuptools";
rev = "refs/tags/v${version}";
hash = "sha256-kll4zYFQn4g/8Fq0Y5vLvDXtotxYMbiNAgGa0sClFQk=";
hash = "sha256-X0ntFlDIhUjxtWzz0LxybQSuxhRpHlMeBYtOGwqDl4A=";
};
patches = [
pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
+16 -16
View File
@@ -1,8 +1,8 @@
diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py
index 47efa377..5cdbbe10 100644
index 539f09d8f..a3d3020cb 100644
--- a/setuptools/_distutils/cygwinccompiler.py
+++ b/setuptools/_distutils/cygwinccompiler.py
@@ -101,14 +101,19 @@ class CygwinCCompiler(UnixCCompiler):
@@ -99,14 +99,19 @@ class CygwinCCompiler(UnixCCompiler):
self.cxx = os.environ.get('CXX', 'g++')
self.linker_dll = self.cc
@@ -12,17 +12,17 @@ index 47efa377..5cdbbe10 100644
self.set_executables(
compiler='%s -mcygwin -O -Wall' % self.cc,
compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc,
compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
+ compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx,
compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
linker_exe='%s -mcygwin' % self.cc,
linker_so=('{} -mcygwin {}'.format(self.linker_dll, shared_option)),
linker_so=(f'{self.linker_dll} -mcygwin {shared_option}'),
+ linker_exe_cxx='%s -mcygwin' % self.cxx,
+ linker_so_cxx=('%s -mcygwin %s' %
+ (self.linker_dll_cxx, shared_option)),
)
# Include the appropriate MSVC runtime library if Python was built
@@ -140,9 +145,12 @@ class CygwinCCompiler(UnixCCompiler):
@@ -138,9 +143,12 @@ class CygwinCCompiler(UnixCCompiler):
raise CompileError(msg)
else: # for other files use the C-compiler
try:
@@ -38,24 +38,24 @@ index 47efa377..5cdbbe10 100644
except DistutilsExecError as msg:
raise CompileError(msg)
@@ -278,9 +286,12 @@ class Mingw32CCompiler(CygwinCCompiler):
@@ -276,9 +284,12 @@ class Mingw32CCompiler(CygwinCCompiler):
self.set_executables(
compiler='%s -O -Wall' % self.cc,
compiler_so='%s -mdll -O -Wall' % self.cc,
+ compiler_so_cxx='%s -mdll -O -Wall' % self.cxx,
compiler_cxx='%s -O -Wall' % self.cxx,
linker_exe='%s' % self.cc,
linker_so='{} {}'.format(self.linker_dll, shared_option),
linker_so=f'{self.linker_dll} {shared_option}',
+ linker_exe_cxx='%s' % self.cxx,
+ linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option)
)
def runtime_library_dir_option(self, dir):
diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
index a40a7231..e5aad4f4 100644
index 1a38e9fa7..034ed6566 100644
--- a/setuptools/_distutils/sysconfig.py
+++ b/setuptools/_distutils/sysconfig.py
@@ -297,6 +297,7 @@ def customize_compiler(compiler): # noqa: C901
@@ -300,6 +300,7 @@ def customize_compiler(compiler): # noqa: C901
cflags,
ccshared,
ldshared,
@@ -63,7 +63,7 @@ index a40a7231..e5aad4f4 100644
shlib_suffix,
ar,
ar_flags,
@@ -306,11 +307,14 @@ def customize_compiler(compiler): # noqa: C901
@@ -309,11 +310,14 @@ def customize_compiler(compiler): # noqa: C901
'CFLAGS',
'CCSHARED',
'LDSHARED',
@@ -78,7 +78,7 @@ index a40a7231..e5aad4f4 100644
if 'CC' in os.environ:
newcc = os.environ['CC']
if 'LDSHARED' not in os.environ and ldshared.startswith(cc):
@@ -322,19 +326,27 @@ def customize_compiler(compiler): # noqa: C901
@@ -325,19 +329,27 @@ def customize_compiler(compiler): # noqa: C901
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
@@ -107,7 +107,7 @@ index a40a7231..e5aad4f4 100644
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
@@ -343,13 +355,17 @@ def customize_compiler(compiler): # noqa: C901
@@ -346,13 +358,17 @@ def customize_compiler(compiler): # noqa: C901
archiver = ar + ' ' + ar_flags
cc_cmd = cc + ' ' + cflags
@@ -127,10 +127,10 @@ index a40a7231..e5aad4f4 100644
)
diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py
index 6ca2332a..5ac64128 100644
index 0248bde87..9508e6cff 100644
--- a/setuptools/_distutils/unixccompiler.py
+++ b/setuptools/_distutils/unixccompiler.py
@@ -115,9 +115,12 @@ class UnixCCompiler(CCompiler):
@@ -118,9 +118,12 @@ class UnixCCompiler(CCompiler):
'preprocessor': None,
'compiler': ["cc"],
'compiler_so': ["cc"],
@@ -144,7 +144,7 @@ index 6ca2332a..5ac64128 100644
'archiver': ["ar", "-cr"],
'ranlib': None,
}
@@ -181,8 +184,13 @@ class UnixCCompiler(CCompiler):
@@ -184,8 +187,13 @@ class UnixCCompiler(CCompiler):
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs)
@@ -159,7 +159,7 @@ index 6ca2332a..5ac64128 100644
except DistutilsExecError as msg:
raise CompileError(msg)
@@ -250,7 +258,8 @@ class UnixCCompiler(CCompiler):
@@ -253,7 +261,8 @@ class UnixCCompiler(CCompiler):
# building an executable or linker_so (with shared options)
# when building a shared library.
building_exe = target_desc == CCompiler.EXECUTABLE