Minor tweaks

- Update pyobjc_setup.py to ensure building release artefacts
  works correctly
- Force use of binary wheels when testing release artefacts

Author: ronaldoussoren

development-support/test-wheels

@@ -41,6 +41,7 @@ def main():
                         DIST_DIR,
                         "--no-index",
                         "--no-cache-dir",
+                        "--only-binary", ":all:",
                         f"pyobjc=={pyobjc_ver()}",
                     ]
                 ).decode("utf-8")

pyobjc-core/Tools/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AVFoundation/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AVKit/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-Accessibility/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-Accounts/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AdServices/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AdSupport/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AddressBook/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AppTrackingTransparency/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AppleScriptKit/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AppleScriptObjC/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-ApplicationServices/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AudioVideoBridging/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AuthenticationServices/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-AutomaticAssessmentConfiguration/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-Automator/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-BusinessChat/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CFNetwork/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CalendarStore/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CallKit/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-ClassKit/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CloudKit/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-Cocoa/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-Collaboration/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-ColorSync/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-Contacts/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-ContactsUI/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreAudio/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreAudioKit/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreBluetooth/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreData/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreHaptics/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreLocation/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreMIDI/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreML/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreMedia/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreMediaIO/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreMotion/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreServices/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreSpotlight/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreText/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")

pyobjc-framework-CoreWLAN/pyobjc_setup.py

@@ -418,7 +418,7 @@ def run(self):
         # Ensure that the PyObjC header files are available
         # in 2.3 and later the headers are in the egg,
         # before that we ship a copy.
-        if not os.path.isfile("Modules/pyobjc-api.h"):
+        if os.path.isdir("Modules") and not os.path.isfile("Modules/pyobjc-api.h"):
             (dist,) = pkg_resources.require("pyobjc-core")
 
             include_root = os.path.join(self.build_temp, "pyobjc-include")