Skip to content

Enable testing on macOS, and make them pass #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bluebird75 merged 14 commits into from
Dec 29, 2021
Merged

Enable testing on macOS, and make them pass #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
323aacf
Enable testing on macOS, and make them pass
altendky Dec 23, 2020
b2ddd08
Merge branch 'master' into macos
altendky Dec 23, 2020
9e7d93d
Merge branch 'master' into macos
altendky Feb 22, 2021
ad672b2
Merge branch 'master' into macos
altendky Nov 29, 2021
fc57303
Merge branch 'master' into macos
altendky Dec 5, 2021
4385b05
update
altendky Dec 5, 2021
5f2b179
add mac version bits
altendky Dec 5, 2021
aeee34e
oops
altendky Dec 5, 2021
30c9ddd
some ignores for macos
altendky Dec 5, 2021
9b47c56
macVersion is a function
altendky Dec 5, 2021
352369f
and MacVersion
altendky Dec 5, 2021
f0ef221
Merge branch 'master' into macos
altendky Dec 27, 2021
53d017d
more macos constants
altendky Dec 28, 2021
19942ff
maybe
altendky Dec 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ jobs:
- name: Linux
runs-on: ubuntu-latest
tox: linux
- name: macOS
runs-on: macos-latest
tox: macos
- name: Windows
runs-on: windows-latest
tox: windows
Expand Down
121 changes: 121 additions & 0 deletions PyQt5-stubs/QtCore.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12850,6 +12850,127 @@ class QSysInfo(sip.simplewrapper):
@staticmethod
def windowsVersion() -> 'QSysInfo.WinVersion': ...

if sys.platform == "darwin":
class MacVersion(int):
MV_10_0 = ... # type: int
MV_10_1 = ... # type: int
MV_10_10 = ... # type: int
MV_10_11 = ... # type: int
MV_10_12 = ... # type: int
MV_10_2 = ... # type: int
MV_10_3 = ... # type: int
MV_10_4 = ... # type: int
MV_10_5 = ... # type: int
MV_10_6 = ... # type: int
MV_10_7 = ... # type: int
MV_10_8 = ... # type: int
MV_10_9 = ... # type: int
MV_9 = ... # type: int
MV_CHEETAH = ... # type: int
MV_ELCAPITAN = ... # type: int
MV_IOS = ... # type: int
MV_IOS_10_0 = ... # type: int
MV_IOS_4_3 = ... # type: int
MV_IOS_5_0 = ... # type: int
MV_IOS_5_1 = ... # type: int
MV_IOS_6_0 = ... # type: int
MV_IOS_6_1 = ... # type: int
MV_IOS_7_0 = ... # type: int
MV_IOS_7_1 = ... # type: int
MV_IOS_8_0 = ... # type: int
MV_IOS_8_1 = ... # type: int
MV_IOS_8_2 = ... # type: int
MV_IOS_8_3 = ... # type: int
MV_IOS_8_4 = ... # type: int
MV_IOS_9_0 = ... # type: int
MV_IOS_9_1 = ... # type: int
MV_IOS_9_2 = ... # type: int
MV_IOS_9_3 = ... # type: int
MV_JAGUAR = ... # type: int
MV_LEOPARD = ... # type: int
MV_LION = ... # type: int
MV_MAVERICKS = ... # type: int
MV_MOUNTAINLION = ... # type: int
MV_PANTHER = ... # type: int
MV_PUMA = ... # type: int
MV_SIERRA = ... # type: int
MV_SNOWLEOPARD = ... # type: int
MV_TIGER = ... # type: int
MV_TVOS = ... # type: int
MV_TVOS_10_0 = ... # type: int
MV_TVOS_9_0 = ... # type: int
MV_TVOS_9_1 = ... # type: int
MV_TVOS_9_2 = ... # type: int
MV_Unknown = ... # type: int
MV_WATCHOS = ... # type: int
MV_WATCHOS_2_0 = ... # type: int
MV_WATCHOS_2_1 = ... # type: int
MV_WATCHOS_2_2 = ... # type: int
MV_WATCHOS_3_0 = ... # type: int
MV_YOSEMITE = ... # type: int

MV_10_0 = ... # type: int
MV_10_1 = ... # type: int
MV_10_10 = ... # type: int
MV_10_11 = ... # type: int
MV_10_12 = ... # type: int
MV_10_2 = ... # type: int
MV_10_3 = ... # type: int
MV_10_4 = ... # type: int
MV_10_5 = ... # type: int
MV_10_6 = ... # type: int
MV_10_7 = ... # type: int
MV_10_8 = ... # type: int
MV_10_9 = ... # type: int
MV_9 = ... # type: int
MV_CHEETAH = ... # type: int
MV_ELCAPITAN = ... # type: int
MV_IOS = ... # type: int
MV_IOS_10_0 = ... # type: int
MV_IOS_4_3 = ... # type: int
MV_IOS_5_0 = ... # type: int
MV_IOS_5_1 = ... # type: int
MV_IOS_6_0 = ... # type: int
MV_IOS_6_1 = ... # type: int
MV_IOS_7_0 = ... # type: int
MV_IOS_7_1 = ... # type: int
MV_IOS_8_0 = ... # type: int
MV_IOS_8_1 = ... # type: int
MV_IOS_8_2 = ... # type: int
MV_IOS_8_3 = ... # type: int
MV_IOS_8_4 = ... # type: int
MV_IOS_9_0 = ... # type: int
MV_IOS_9_1 = ... # type: int
MV_IOS_9_2 = ... # type: int
MV_IOS_9_3 = ... # type: int
MV_JAGUAR = ... # type: int
MV_LEOPARD = ... # type: int
MV_LION = ... # type: int
MV_MAVERICKS = ... # type: int
MV_MOUNTAINLION = ... # type: int
MV_PANTHER = ... # type: int
MV_PUMA = ... # type: int
MV_SIERRA = ... # type: int
MV_SNOWLEOPARD = ... # type: int
MV_TIGER = ... # type: int
MV_TVOS = ... # type: int
MV_TVOS_10_0 = ... # type: int
MV_TVOS_9_0 = ... # type: int
MV_TVOS_9_1 = ... # type: int
MV_TVOS_9_2 = ... # type: int
MV_Unknown = ... # type: int
MV_WATCHOS = ... # type: int
MV_WATCHOS_2_0 = ... # type: int
MV_WATCHOS_2_1 = ... # type: int
MV_WATCHOS_2_2 = ... # type: int
MV_WATCHOS_3_0 = ... # type: int
MV_YOSEMITE = ... # type: int

MacintoshVersion = ... # type: QSysInfo.MacVersion

@staticmethod
def macVersion() -> 'QSysInfo.MacVersion': ...

@typing.overload
def __init__(self) -> None: ...
@typing.overload
Expand Down
7 changes: 7 additions & 0 deletions stubtest.allowlist.macos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Linux only
PyQt5.QtX11Extras

# To review
PyQt5.QtGui.QDrag.cancel
PyQt5.QtWidgets.QMacCocoaViewContainer
PyQt5.QtWidgets.QMenu.setAsDockMenu
3 changes: 2 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ envlist = py3{6,7,8,9,10}-{windows,linux}
deps =
pip>=20.0
setenv:
windows: OS_MARKER = windows
linux: OS_MARKER = linux
macos: OS_MARKER = macos
windows: OS_MARKER = windows
extras =
dev
commands =
Expand Down