Merge pull request #36 from open-vcpkg/setuptools7011

[py-setuptools, py-packaging] Bump versions
open-vcpkg · Jun 28, 2024 · c87f511 · c87f511
2 parents 76f0d3d + 115cf81
commit c87f511
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/ports/py-packaging/vcpkg.json b/ports/py-packaging/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "py-packaging",
-  "version": "23.1",
-  "port-version": 1,
+  "version": "24.1",
   "description": "Core utilities for Python packages",
   "homepage": "https://packaging.pypa.io/",
   "license": "MIT",

diff --git a/ports/py-setuptools/fix-prefix.patch b/ports/py-setuptools/fix-prefix.patch
@@ -1,8 +1,8 @@
 diff --git a/setuptools/_distutils/command/build_ext.py b/setuptools/_distutils/command/build_ext.py
-index fbeec342c0..ff28ab2df4 100644
---- a/setuptools/_distutils/command/build_ext.py	
+index 06d949a..0dee0fe 100644
+--- a/setuptools/_distutils/command/build_ext.py
 +++ b/setuptools/_distutils/command/build_ext.py
-@@ -186,6 +186,14 @@ class build_ext(Command):
+@@ -209,6 +209,14 @@ class build_ext(Command):
          elif isinstance(self.rpath, str):
              self.rpath = self.rpath.split(os.pathsep)
 
@@ -17,7 +17,7 @@ index fbeec342c0..ff28ab2df4 100644
          # for extensions under windows use different directories
          # for Release and Debug builds.
          # also Python's library directory must be appended to library_dirs
-@@ -193,9 +201,9 @@ class build_ext(Command):
+@@ -216,9 +224,9 @@ class build_ext(Command):
              # the 'libs' directory is for binary installs - we assume that
              # must be the *native* platform.  But we don't really support
              # cross-compiling via a binary install anyway, so we let it go.
@@ -31,10 +31,10 @@ index fbeec342c0..ff28ab2df4 100644
                  self.build_temp = os.path.join(self.build_temp, "Debug")
              else:
 diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
-index a40a7231b3..7194f440b4 100644
---- a/setuptools/_distutils/sysconfig.py	
+index 1a38e9f..2c8174d 100644
+--- a/setuptools/_distutils/sysconfig.py
 +++ b/setuptools/_distutils/sysconfig.py
-@@ -190,19 +190,22 @@ def _get_python_inc_from_config(plat_specific, spec_prefix):
+@@ -191,18 +191,21 @@ def _get_python_inc_from_config(plat_specific, spec_prefix):
  def _get_python_inc_posix_prefix(prefix):
      implementation = 'pypy' if IS_PYPY else 'python'
      python_dir = implementation + get_python_version() + build_flags
@@ -47,14 +47,12 @@ index a40a7231b3..7194f440b4 100644
 +    vcpkg_prefix = os.path.dirname(os.path.dirname(prefix))
 +    python_dir = 'python' + get_python_version()
      if python_build:
-         # Include both the include and PC dir to ensure we can find
-         # pyconfig.h
+         # Include both include dirs to ensure we can find pyconfig.h
          return (
 -            os.path.join(prefix, "include")
 +            os.path.join(vcpkg_prefix, "include", python_dir)
              + os.path.pathsep
--            + os.path.join(prefix, "PC")
-+            + os.path.join(vcpkg_prefix, "PC")
+             + os.path.dirname(sysconfig.get_config_h_filename())
          )
 -    return os.path.join(prefix, "include")
 +    return os.path.join(vcpkg_prefix, "include", python_dir)

diff --git a/ports/py-setuptools/portfile.cmake b/ports/py-setuptools/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_pythonhosted(
     OUT_SOURCE_PATH SOURCE_PATH
     PACKAGE_NAME    setuptools
     VERSION         ${VERSION}
-    SHA512          11df934931f4b73f7e07ea5713479593c6baa134d423556b2ae7aff0f1e5bdbdee1f5b516131adb169c838231ceb0293441fbf275ef7030dabecf74122565b6d
+    SHA512          63452aa1e1d1dea6ad622a21fcc9334bc3603e45de9a1485f79776e02a0fb3b0a0a8b3e886af73845c3c373348c7021f2e06a5665676e9015ee9855441512136
     PATCHES 
       fix-prefix.patch
 )
@@ -15,4 +15,4 @@ vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 #execute_process(COMMAND ${PYTHON3} "${SOURCE_PATH}/setup.py" install "--prefix=${CURRENT_INSTALLED_DIR}/tools/python3" "--root=${CURRENT_PACKAGES_DIR}"
 #  COMMAND_ERROR_IS_FATAL ANY
 #  WORKING_DIRECTORY  "${CURRENT_PACKAGES_DIR}/tools/python3"
-#)
+#)
diff --git a/ports/py-setuptools/vcpkg.json b/ports/py-setuptools/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "py-setuptools",
-  "version": "69.0.3",
-  "port-version": 2,
+  "version": "70.1.1",
   "description": "Official project repository for the Setuptools build system ",
   "homepage": "https://pypi.org/project/setuptools/",
   "license": "MIT",