Skip to content

Commit eca9dca

Browse files
Various test updates
1 parent 0d85e4f commit eca9dca

File tree

78 files changed

+301
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+301
-4
lines changed

development-support/test-wheels

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def main():
6161
[
6262
interpreter,
6363
os.path.join(os.path.dirname(__file__), "wheel-smoke-test.py"),
64+
pyobjc_ver(),
6465
]
6566
)
6667

development-support/wheel-smoke-test.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
55
# NOTE: This file is not yet complete
66
"""
7+
import sys
78

89
import functools
910
import platform
1011

11-
import objc # noqa: F401
12+
import objc
13+
14+
if sys.argv[1] != objc.__version__:
15+
raise SystemExit("Version mismatch")
16+
1217
from AddressBook import * # noqa: F401, F403
1318
from AppleScriptKit import * # noqa: F401, F403
1419
from AppleScriptObjC import * # noqa: F401, F403

pyobjc-core/Modules/objc/module.m

+1
Original file line numberDiff line numberDiff line change
@@ -2043,6 +2043,7 @@ + (void)targetForBecomingMultiThreaded:(id)sender
20432043
{"MAC_OS_X_VERSION_12_3", MAC_OS_X_VERSION_12_3},
20442044
{"MAC_OS_X_VERSION_12_4", MAC_OS_X_VERSION_12_4},
20452045
{"MAC_OS_X_VERSION_12_5", MAC_OS_X_VERSION_12_5},
2046+
{"MAC_OS_X_VERSION_12_6", MAC_OS_X_VERSION_12_6},
20462047
{"PyObjC_BUILD_RELEASE", PyObjC_BUILD_RELEASE},
20472048
{"_NSNotFound", NSNotFound},
20482049
{"OBJC_ASSOCIATION_ASSIGN", OBJC_ASSOCIATION_ASSIGN},

pyobjc-core/Modules/objc/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-core/PyObjCTest/test_methodaccess.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ def test_replace_through_instane(self):
286286
):
287287
o.description = 42
288288

289-
def test_replace_through_class(self):
289+
def no_test_replace_through_class(self):
290+
# Reverted, see #479
290291
with self.assertRaisesRegex(
291292
AttributeError,
292293
"Cannot replace selector 'alloc' in 'NSObject' by non-selector",

pyobjc-framework-AVKit/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-Accessibility/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-AddressBook/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-ApplicationServices/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-AuthenticationServices/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-AutomaticAssessmentConfiguration/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CFNetwork/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-ClassKit/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-Cocoa/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-Contacts/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-ContactsUI/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreAudio/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreAudioKit/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreBluetooth/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreLocation/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreMIDI/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreML/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreMedia/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreMediaIO/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreServices/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreSpotlight/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreText/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CoreWLAN/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-CryptoTokenKit/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-DiscRecording/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-ExternalAccessory/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-FSEvents/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-FileProvider/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-GameCenter/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-GameController/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

pyobjc-framework-GameKit/Modules/pyobjc-compat.h

+4
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ NS_ASSUME_NONNULL_BEGIN
276276
#define MAC_OS_X_VERSION_12_5 120500
277277
#endif
278278

279+
#ifndef MAC_OS_X_VERSION_12_6
280+
#define MAC_OS_X_VERSION_12_6 120600
281+
#endif
282+
279283
/*
280284
*
281285
* End of Cocoa definitions

0 commit comments

Comments
 (0)