Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 73379f9

Browse filesBrowse files
Merge pull request #171 from akv-platform/v-sdolin/issue-402
Explicitly link brew tcl/tk
2 parents 8a2b258 + edcd32d commit 73379f9
Copy full SHA for 73379f9

File tree

Expand file treeCollapse file tree

3 files changed

+20
-0
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+20
-0
lines changed

‎builders/macos-python-builder.psm1

Copy file name to clipboardExpand all lines: builders/macos-python-builder.psm1
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ class macOSPythonBuilder : NixPythonBuilder {
5959
$env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/zlib/include"
6060
} else {
6161
$configureString += " --with-openssl=/usr/local/opt/openssl@1.1"
62+
if ($this.Version -gt "3.7.12") {
63+
$configureString += " --with-tcltk-includes='-I /usr/local/opt/tcl-tk/include' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'"
64+
}
6265
}
6366

6467
### Compile with support of loadable sqlite extensions. Unavailable for Python 2.*

‎tests/python-tests.ps1

Copy file name to clipboardExpand all lines: tests/python-tests.ps1
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ Describe "Tests" {
4949
"python ./sources/simple-test.py" | Should -ReturnZeroExitCode
5050
}
5151

52+
# linux has no display name and no $DISPLAY environment variable - skip tk test
53+
if (-not (($Platform -match "ubuntu") -or ($Platform -match "linux"))) {
54+
It "Check if tcl/tk has the same headed and library versions" {
55+
"python ./sources/tcltk.py" | Should -ReturnZeroExitCode
56+
}
57+
}
58+
5259
if (($Version -ge "3.2.0") -and -not ([semver]"$($Version.Major).$($Version.Minor)" -eq [semver]"3.11" -and $Version.PreReleaseLabel)) {
5360
It "Check if sqlite3 module is installed" {
5461
"python ./sources/python-sqlite3.py" | Should -ReturnZeroExitCode

‎tests/sources/tcltk.py

Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import tkinter
2+
import _tkinter
3+
4+
header = _tkinter.TK_VERSION
5+
lib = tkinter.Tk().getvar('tk_version')
6+
7+
if lib != header:
8+
print('header version=' + header)
9+
print('lib version=' + lib)
10+
exit(1)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.