Merge branch 'main' into Merge-typeshed-return-annotations

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 75.5.0
+current_version = 75.6.0
 commit = True
 tag = True
 

NEWS.rst

@@ -1,3 +1,15 @@
+v75.6.0
+=======
+
+Features
+--------
+
+- Preserve original ``PKG-INFO`` into ``METADATA`` when creating wheel
+  (instead of calling ``wheel.metadata.pkginfo_to_metadata``).
+  This helps to be more compliant with the flow specified in PEP 517. (#4701)
+- Changed the ``WindowsSdkVersion``, ``FrameworkVersion32`` and ``FrameworkVersion64`` properties of ``setuptools.msvc.PlatformInfo`` to return an empty `tuple` instead of `None` as a fallthrough case --  by :user:`Avasam` (#4754)
+
+
 v75.5.0
 =======
 

pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "setuptools"
-version = "75.5.0"
+version = "75.6.0"
 authors = [
 	{ name = "Python Packaging Authority", email = "distutils-sig@python.org" },
 ]

setuptools/msvc.py

@@ -579,7 +579,7 @@ def _guess_vc_legacy(self):
         return self.ri.lookup(self.ri.vc, '%0.1f' % self.vs_ver) or default_vc
 
     @property
-    def WindowsSdkVersion(self) -> tuple[LiteralString, ...] | None:
+    def WindowsSdkVersion(self) -> tuple[LiteralString, ...]:
         """
         Microsoft Windows SDK versions for specified MSVC++ version.
 
@@ -598,7 +598,7 @@ def WindowsSdkVersion(self) -> tuple[LiteralString, ...] | None:
             return '8.1', '8.1a'
         elif self.vs_ver >= 14.0:
             return '10.0', '8.1'
-        return None
+        return ()
 
     @property
     def WindowsSdkLastVersion(self) -> str:
@@ -805,7 +805,7 @@ def FrameworkDir64(self) -> str:
         return self.ri.lookup(self.ri.vc, 'frameworkdir64') or guess_fw
 
     @property
-    def FrameworkVersion32(self) -> tuple[str, ...] | None:
+    def FrameworkVersion32(self) -> tuple[str, ...]:
         """
         Microsoft .NET Framework 32bit versions.
 
@@ -817,7 +817,7 @@ def FrameworkVersion32(self) -> tuple[str, ...] | None:
         return self._find_dot_net_versions(32)
 
     @property
-    def FrameworkVersion64(self) -> tuple[str, ...] | None:
+    def FrameworkVersion64(self) -> tuple[str, ...]:
         """
         Microsoft .NET Framework 64bit versions.
 
@@ -828,7 +828,7 @@ def FrameworkVersion64(self) -> tuple[str, ...] | None:
         """
         return self._find_dot_net_versions(64)
 
-    def _find_dot_net_versions(self, bits):
+    def _find_dot_net_versions(self, bits) -> tuple[str, ...]:
         """
         Find Microsoft .NET Framework versions.
 
@@ -856,7 +856,7 @@ def _find_dot_net_versions(self, bits):
             return 'v3.5', 'v2.0.50727'
         elif self.vs_ver == 8.0:
             return 'v3.0', 'v2.0.50727'
-        return None
+        return ()
 
     @staticmethod
     def _use_last_dir_name(path, prefix=''):