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

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Lib/pyobjc_framework_Quartz.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobjc-framework-Quartz
-Version: 10.3.1
+Version: 10.3.2
 Summary: Wrappers for the Quartz frameworks on macOS
 Home-page: https://github.com/ronaldoussoren/pyobjc
 Author: Ronald Oussoren
@@ -31,8 +31,8 @@ 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-framework-Cocoa>=10.3.1
+Requires-Dist: pyobjc-core>=10.3.2
+Requires-Dist: pyobjc-framework-Cocoa>=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_quartz-10.3.2/Lib/pyobjc_framework_Quartz.egg-info/requires.txt

@@ -0,0 +1,2 @@
+pyobjc-core>=10.3.2
+pyobjc-framework-Cocoa>=10.3.2

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_CoreGraphics_inlines.m

@@ -1,4 +1,6 @@
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_CoreImage.m

@@ -1,7 +1,9 @@
 /*
  * Manual wrappers for CoreImage
  */
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_PDFKit.m

@@ -1,7 +1,9 @@
 /*
  * Manual wrappers for PDFKit
  */
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_QuickLookUI.m

@@ -1,7 +1,9 @@
 /*
  * Manual wrappers for QuickLookUI
  */
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_coregraphics.m

@@ -204,6 +204,7 @@ m_CGWindowListCreateDescriptionFromArray(PyObject* self __attribute__((__unused_
     return rv;
 }
 
+#if defined(MAC_OS_X_VERSION_15_0) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_15_0
 static PyObject*
 m_CGWindowListCreateImageFromArray(PyObject* self __attribute__((__unused__)),
                                    PyObject* args)
@@ -264,6 +265,7 @@ m_CGWindowListCreateImageFromArray(PyObject* self __attribute__((__unused__)),
     CFRelease(image);
     return rv;
 }
+#endif /* defined(MAC_OS_X_VERSION_15_0) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_15_0 */
 
 static PyObject*
 m_CGBitmapContextCreate(PyObject* self __attribute__((__unused__)), PyObject* args)
@@ -622,8 +624,10 @@ static PyMethodDef mod_methods[] = {
     {"CGWindowListCreate", (PyCFunction)m_CGWindowListCreate, METH_VARARGS, NULL},
     {"CGWindowListCreateDescriptionFromArray",
      (PyCFunction)m_CGWindowListCreateDescriptionFromArray, METH_VARARGS, NULL},
+#if defined(MAC_OS_X_VERSION_15_0) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_15_0
     {"CGWindowListCreateImageFromArray", (PyCFunction)m_CGWindowListCreateImageFromArray,
      METH_VARARGS, NULL},
+#endif /* defined(MAC_OS_X_VERSION_15_0) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_15_0 */
     {"CGBitmapContextCreate", (PyCFunction)m_CGBitmapContextCreate, METH_VARARGS, NULL},
     {"CGBitmapContextCreateWithData", (PyCFunction)m_CGBitmapContextCreateWithData,
      METH_VARARGS, NULL},

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_doubleindirect.m

@@ -2,7 +2,9 @@
  * Functions that return arrays by indirection, something that cannot be
  * described by the metadata.
  */
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_imagekit.m

@@ -1,7 +1,9 @@
 /*
  * Manual wrappers for ImageKit
  */
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_quartzcore.m

@@ -1,7 +1,9 @@
 /*
  * Manual wrappers for QuartzCore
  */
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/Modules/_sortandmap.m

@@ -1,7 +1,9 @@
 /*
  * Functions with a callback argument that isn't "retained"
  */
+#ifndef PyObjC_GIL_DISABLED
 #define Py_LIMITED_API 0x03060000
+#endif
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobjc-framework-Quartz
-Version: 10.3.1
+Version: 10.3.2
 Summary: Wrappers for the Quartz frameworks on macOS
 Home-page: https://github.com/ronaldoussoren/pyobjc
 Author: Ronald Oussoren
@@ -31,8 +31,8 @@ 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-framework-Cocoa>=10.3.1
+Requires-Dist: pyobjc-core>=10.3.2
+Requires-Dist: pyobjc-framework-Cocoa>=10.3.2
 
 
 Wrappers for the "Quartz" related frameworks on macOS. These frameworks

{pyobjc_framework_quartz-10.3.1 → pyobjc_framework_quartz-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_quartz-10.3.1 → pyobjc_framework_quartz-10.3.2}/setup.py

@@ -51,7 +51,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-Quartz",

pyobjc_framework_quartz-10.3.1/Lib/pyobjc_framework_Quartz.egg-info/requires.txt

@@ -1,2 +0,0 @@
-pyobjc-core>=10.3.1
-pyobjc-framework-Cocoa>=10.3.1