pyobjc-framework-Cocoa 10.3.1__tar.gz → 10.3.2__tar.gz

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Lib/PyObjCTools/AppHelper.py

@@ -135,40 +135,39 @@ class PyObjCAppHelperApplicationActivator(NSObject):
 class PyObjCAppHelperRunLoopStopper(NSObject):
     singletons = {}
 
+    @classmethod
     def currentRunLoopStopper(cls):
         runLoop = NSRunLoop.currentRunLoop()
         return cls.singletons.get(runLoop)
 
-    currentRunLoopStopper = classmethod(currentRunLoopStopper)
-
     def init(self):
         self = super().init()
         self.shouldStop = False
+        self.isConsole = False
         return self
 
     def shouldRun(self):
         return not self.shouldStop
 
+    @classmethod
     def addRunLoopStopper_toRunLoop_(cls, runLoopStopper, runLoop):
         if runLoop in cls.singletons:
             raise ValueError("Stopper already registered for this runLoop")
         cls.singletons[runLoop] = runLoopStopper
 
-    addRunLoopStopper_toRunLoop_ = classmethod(addRunLoopStopper_toRunLoop_)
-
+    @classmethod
     def removeRunLoopStopperFromRunLoop_(cls, runLoop):
         if runLoop not in cls.singletons:
             raise ValueError("Stopper not registered for this runLoop")
         del cls.singletons[runLoop]
 
-    removeRunLoopStopperFromRunLoop_ = classmethod(removeRunLoopStopperFromRunLoop_)
-
     def stop(self):
         self.shouldStop = True
         # this should go away when/if runEventLoop uses
         # runLoop iteration
-        if NSApp() is not None:
-            NSApp().terminate_(self)
+        if not self.isConsole:
+            if NSApp() is not None:
+                NSApp().terminate_(self)
 
     def performStop_(self, sender):
         self.stop()
@@ -249,6 +248,7 @@ def runConsoleEventLoop(
         installMachInterrupt()
     runLoop = NSRunLoop.currentRunLoop()
     stopper = PyObjCAppHelperRunLoopStopper.alloc().init()
+    stopper.isConsole = True
     PyObjCAppHelperRunLoopStopper.addRunLoopStopper_toRunLoop_(stopper, runLoop)
     try:
         while stopper.shouldRun():

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Lib/pyobjc_framework_Cocoa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobjc-framework-Cocoa
-Version: 10.3.1
+Version: 10.3.2
 Summary: Wrappers for the Cocoa frameworks on macOS
 Home-page: https://github.com/ronaldoussoren/pyobjc
 Author: Ronald Oussoren
@@ -31,7 +31,7 @@ Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
-Requires-Dist: pyobjc-core>=10.3.1
+Requires-Dist: pyobjc-core>=10.3.2
 Project-URL: Documentation, https://pyobjc.readthedocs.io/en/latest/
 Project-URL: Issue tracker, https://github.com/ronaldoussoren/pyobjc/issues
 Project-URL: Repository, https://github.com/ronaldoussoren/pyobjc

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Lib/pyobjc_framework_Cocoa.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.txt
 pyobjc_setup.py
 pyproject.toml
 setup.py
+t.py
 Examples/AppKit/ClassBrowser/ClassBrowser.py
 Examples/AppKit/ClassBrowser/setup.py
 Examples/AppKit/ClassBrowser/summary.txt

pyobjc_framework_cocoa-10.3.2/Lib/pyobjc_framework_Cocoa.egg-info/requires.txt

@@ -0,0 +1 @@
+pyobjc-core>=10.3.2

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Modules/_AppKit_inlines.m

@@ -1,4 +1,3 @@
-#define Py_LIMITED_API 0x03060000
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Modules/_CoreFoundation_inlines.m

@@ -1,4 +1,3 @@
-#define Py_LIMITED_API 0x03060000
 #define PY_SSIZE_T_CLEAN
 #define CF_INLINE
 #include "Python.h"

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Modules/_Foundation.m

@@ -1,4 +1,3 @@
-#define Py_LIMITED_API 0x03060000
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Modules/_Foundation_inlines.m

@@ -1,4 +1,3 @@
-#define Py_LIMITED_API 0x03060000
 #define PY_SSIZE_T_CLEAN
 #define NS_INLINE
 #include "Python.h"

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/Modules/testhelper.m

@@ -1,4 +1,3 @@
-#define Py_LIMITED_API 0x03060000
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobjc-framework-Cocoa
-Version: 10.3.1
+Version: 10.3.2
 Summary: Wrappers for the Cocoa frameworks on macOS
 Home-page: https://github.com/ronaldoussoren/pyobjc
 Author: Ronald Oussoren
@@ -31,7 +31,7 @@ Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
-Requires-Dist: pyobjc-core>=10.3.1
+Requires-Dist: pyobjc-core>=10.3.2
 
 
 Wrappers for the core Cocoa frameworks: CoreFoundation, Foundation and

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_cfrunloop.py

@@ -291,6 +291,10 @@ class TestRunLoop(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     @min_os_level("10.6")
     def testFunctions10_6(self):
         self.assertArgIsBlock(CoreFoundation.CFRunLoopPerformBlock, 2, b"v")
@@ -315,6 +319,10 @@ class TestRunLoop(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     @min_os_level("10.7")
     def testFunctions10_7(self):
         self.assertArgIsBOOL(CoreFoundation.CFRunLoopObserverCreateWithHandler, 2)

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_cfstream.py

@@ -427,6 +427,10 @@ class TestStream(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testReadSocketASync(self):
         rl = CoreFoundation.CFRunLoopGetCurrent()
 
@@ -492,6 +496,10 @@ class TestStream(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testWriteSocketAsync(self):
         rl = CoreFoundation.CFRunLoopGetCurrent()
 

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nsaccessibility.py

@@ -147,6 +147,10 @@ class TestNSAccessibility(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testFunction(self):
         v = AppKit.NSAccessibilityRoleDescription(
             AppKit.NSAccessibilityButtonRole, None

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nsapplication.py

@@ -245,6 +245,10 @@ class TestNSApplication(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testNSModalSession(self):
         self.assertIsOpaquePointer(AppKit.NSModalSession)
 

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nscell.py

@@ -24,9 +24,7 @@ class TestNSCell(TestCase):
         self.assertIsEnumType(AppKit.NSImageScaling)
 
     @skipUnless(
-        not (
-            os_level_key("10.13") <= os_level_key(os_release()) < os_level_key("10.15")
-        ),
+        not (os_level_key("10.13") <= os_level_key(os_release())),
         "doesn't work on 10.13, 10.14",
     )
     def testUnicode(self):
@@ -36,9 +34,7 @@ class TestNSCell(TestCase):
         self.assertEqual(cell.stringValue(), u)
 
     @skipUnless(
-        not (
-            os_level_key("10.13") <= os_level_key(os_release()) < os_level_key("10.15")
-        ),
+        not (os_level_key("10.13") <= os_level_key(os_release())),
         "doesn't work on 10.13, 10.14",
     )
     def testInt(self):
@@ -48,9 +44,7 @@ class TestNSCell(TestCase):
         self.assertEqual(cell.intValue(), i)
 
     @skipUnless(
-        not (
-            os_level_key("10.13") <= os_level_key(os_release()) < os_level_key("10.15")
-        ),
+        not (os_level_key("10.13") <= os_level_key(os_release())),
         "doesn't work on 10.13, 10.14",
     )
     def testFloat(self):

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nsfont.py

@@ -25,6 +25,10 @@ class TestNSFont(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testMatrixMethods(self):
         o = AppKit.NSFont.boldSystemFontOfSize_(10)
         m = o.matrix()

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nsopenpanel.py

@@ -16,6 +16,10 @@ class TestOpenPanel(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testOpenPanelSignature(self):
         o = AppKit.NSOpenPanel.openPanel()
         sig = (
@@ -69,6 +73,10 @@ class TestOpenPanel(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def test_issue_272(self):
         panel = AppKit.NSOpenPanel.openPanel()
         panel.setAllowedFileTypes_([".html", ".txt"])

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nspanel.py

@@ -16,6 +16,10 @@ class TestNSPanel(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testFunctions(self):
         self.assertArgIsPrintf(AppKit.NSRunAlertPanel, 1)
         self.assertArgIsPrintf(AppKit.NSRunInformationalAlertPanel, 1)

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nssavepanel.py

@@ -1,5 +1,12 @@
 import AppKit
-from PyObjCTools.TestSupport import TestCase, min_os_level, min_sdk_level
+from PyObjCTools.TestSupport import (
+    TestCase,
+    min_os_level,
+    min_sdk_level,
+    skipUnless,
+    os_level_key,
+    os_release,
+)
 import objc
 
 
@@ -107,6 +114,10 @@ class TestNSSavePanel(TestCase):
         self.assertResultIsBOOL(AppKit.NSSavePanel.showsTagField)
 
     @min_os_level("10.15")
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def test_issue282(self):
         panel = AppKit.NSSavePanel.savePanel()
         self.assertIsInstance(panel, AppKit.NSSavePanel)

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/PyObjCTest/test_nstimer.py

@@ -49,6 +49,10 @@ class TestNSTimer(TestCase):
         ),
         "Crash on 10.13, 10.14??",
     )
+    @skipUnless(
+        not (os_level_key("15.0") <= os_level_key(os_release()) < os_level_key("16.0")),
+        "Crash on macOS 15",
+    )
     def testPythonLeakage(self):
         # Ignore first run, this has some side-effects that would
         # taint the result.

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/pyobjc_setup.py

@@ -22,11 +22,12 @@ import sys
 import tempfile
 import time
 import unittest
+from fnmatch import fnmatch
 from sysconfig import get_config_var, get_config_vars
 from setuptools import Command
 from setuptools import Extension as _Extension
 from setuptools import setup as _setup
-from setuptools.command import build_ext, build_py, develop, egg_info, install_lib, test
+from setuptools.command import build_ext, build_py, develop, egg_info, install_lib
 
 from distutils import log
 from distutils.errors import DistutilsError, DistutilsPlatformError
@@ -84,18 +85,14 @@ class oc_egg_info(egg_info.egg_info):
             fp.write(last)
 
 
-class oc_test(test.test):
+class oc_test(Command):
     description = "run test suite"
-    user_options = test.test.user_options + [
-        ("verbosity=", None, "print what tests are run")
-    ]
+    user_options = [("verbosity=", None, "print what tests are run")]
 
     def initialize_options(self):
-        test.test.initialize_options(self)
         self.verbosity = "1"
 
     def finalize_options(self):
-        test.test.finalize_options(self)
         if isinstance(self.verbosity, str):
             self.verbosity = int(self.verbosity)
 
@@ -154,18 +151,14 @@ class oc_test(test.test):
         self.cleanup_environment()
         self.add_project_to_sys_path()
 
-        from pkg_resources import EntryPoint
-
-        loader_ep = EntryPoint.parse("x=" + self.test_loader)
-        loader_class = loader_ep.resolve()
-
         import warnings
 
         warnings.simplefilter("error")
+        warnings.filterwarnings("ignore", message=".*GIL.*", category=RuntimeWarning)
 
         try:
             time_before = time.time()
-            suite = loader_class().loadTestsFromName(self.distribution.test_suite)
+            suite = makeTestSuite()
 
             if self.verbose and self.verbosity < 3:
                 runner = unittest.TextTestRunner(verbosity=3)
@@ -511,21 +504,17 @@ def Extension(*args, **kwds):
             % (tuple(map(int, os_level.split(".")[:2])))
         )
 
-    # XCode 15 has a bug w.r.t. weak linking for older macOS versions,
-    # fall back to older linker when using that compiler.
-    # XXX: This should be in _fixup_compiler but doesn't work there...
-    lines = subprocess.check_output(["xcodebuild", "-version"], text=True).splitlines()
-    if lines[0].startswith("Xcode"):
-        xcode_vers = int(lines[0].split()[-1].split(".")[0])
-        if xcode_vers >= 15:
-            ldflags.append("-Wl,-ld_classic")
-
     if os_level == "10.4":
         cflags.append("-DNO_OBJC2_RUNTIME")
 
     if "-Werror" not in cflags:
         cflags.append("-Werror")
 
+    if get_config_var("Py_GIL_DISABLED"):
+        cflags.append("-DPyObjC_GIL_DISABLED")
+        if "py_limited_api" in kwds:
+            del kwds["py_limited_api"]
+
     if "extra_compile_args" in kwds:
         kwds["extra_compile_args"] = kwds["extra_compile_args"] + cflags
     else:
@@ -618,6 +607,10 @@ def setup(min_os_level=None, max_os_level=None, cmdclass=None, **kwds):
         # No extension modules, can build universal wheel
         k["options"] = {"bdist_wheel": {"universal": 1}}
 
+    if "options" in k and "bdist_wheel" in k["options"]:
+        if get_config_var("Py_GIL_DISABLED"):
+            del k["options"]["bdist_wheel"]
+
     plat_name = "MacOS X"
     plat_versions = []
     if min_os_level is not None and min_os_level == max_os_level:
@@ -675,3 +668,50 @@ def setup(min_os_level=None, max_os_level=None, cmdclass=None, **kwds):
         keywords=["PyObjC"] + [p for p in k["packages"] if p not in ("PyObjCTools",)],
         **k,
     )
+
+
+def recursiveGlob(root, pathPattern):
+    """
+    Recursively look for files matching 'pathPattern'. Return a list
+    of matching files/directories.
+    """
+    result = []
+
+    for rootpath, _dirnames, filenames in os.walk(root):
+        for fn in filenames:
+            if fnmatch(fn, pathPattern):
+                result.append(os.path.join(rootpath, fn))
+    return result
+
+
+def importExternalTestCases(pathPattern="test_*.py", root=".", package=None):
+    """
+    Import all unittests in the PyObjC tree starting at 'root'
+    """
+    testFiles = recursiveGlob(root, pathPattern)
+    testModules = [x[len(root) + 1 : -3].replace("/", ".") for x in testFiles]
+    if package is not None:
+        testModules = [(package + "." + m) for m in testModules]
+    suites = []
+    for modName in testModules:
+        try:
+            module = __import__(modName)
+        except ImportError as msg:
+            print(f"SKIP {modName}: {msg}")
+            continue
+        if "." in modName:
+            for elem in modName.split(".")[1:]:
+                module = getattr(module, elem)
+        s = unittest.defaultTestLoader.loadTestsFromModule(module)
+        suites.append(s)
+    return unittest.TestSuite(suites)
+
+
+gTopdir = os.path.dirname(__file__)
+
+
+def makeTestSuite():
+    plain_suite = importExternalTestCases(
+        "test_*.py", os.path.join(gTopdir, "PyObjCTest"), package="PyObjCTest"
+    )
+    return plain_suite

{pyobjc_framework_cocoa-10.3.1 → pyobjc_framework_cocoa-10.3.2}/setup.py

@@ -16,7 +16,7 @@ sys.path.insert(0, os.path.dirname(__file__))
 
 from pyobjc_setup import Extension, setup  # noqa: E402
 
-VERSION = "10.3.1"
+VERSION = "10.3.2"
 
 setup(
     name="pyobjc-framework-Cocoa",

pyobjc_framework_cocoa-10.3.2/t.py

@@ -0,0 +1,4 @@
+from Foundation import NSIndexSet
+print(1)
+print(NSIndexSet.indexSetWithIndex_(0))
+print(NSIndexSet.alloc().initWithIndex_(0))

pyobjc_framework_cocoa-10.3.1/Lib/pyobjc_framework_Cocoa.egg-info/requires.txt

@@ -1 +0,0 @@
-pyobjc-core>=10.3.1