Skip to content

Commit

Permalink
Disable universal2 macOS builds (#175)
Browse files Browse the repository at this point in the history
* Disable universal2 macOS builds

* Debug

* Disable universal build and tcl test
  • Loading branch information
Vladimir Safonkin authored Jul 11, 2022
1 parent eaa180e commit 714163c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions builders/macos-python-builder.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ class macOSPythonBuilder : NixPythonBuilder {
### will never be used itself by a Github Actions runner but using a universal2 Python is the only way to build
### universal2 C extensions and wheels. This is supported by Python >= 3.10 and was backported to Python >=
### 3.9.1 and >= 3.8.10.
if ($this.Version -ge "3.8.10" -and $this.Version -ne "3.8.13" -and $this.Version -ne "3.9.0" ) {
$configureString += " --enable-universalsdk --with-universal-archs=universal2"
}
### Disabled, discussion: https://github.com/actions/python-versions/pull/114
# if ($this.Version -ge "3.8.10" -and $this.Version -ne "3.8.13" -and $this.Version -ne "3.9.0" ) {
# $configureString += " --enable-universalsdk --with-universal-archs=universal2"
# }

### OS X 10.11, Apple no longer provides header files for the deprecated system version of OpenSSL.
### Solution is to install these libraries from a third-party package manager,
Expand Down
10 changes: 5 additions & 5 deletions tests/python-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ Describe "Tests" {
}

# linux has no display name and no $DISPLAY environment variable - skip tk test
if (-not (($Platform -match "ubuntu") -or ($Platform -match "linux"))) {
It "Check if tcl/tk has the same headed and library versions" {
"python ./sources/tcltk.py" | Should -ReturnZeroExitCode
}
}
# if (-not (($Platform -match "ubuntu") -or ($Platform -match "linux"))) {
# It "Check if tcl/tk has the same headed and library versions" {
# "python ./sources/tcltk.py" | Should -ReturnZeroExitCode
# }
# }

if (($Version -ge "3.2.0") -and -not ([semver]"$($Version.Major).$($Version.Minor)" -eq [semver]"3.11" -and $Version.PreReleaseLabel)) {
It "Check if sqlite3 module is installed" {
Expand Down

0 comments on commit 714163c

Please sign in to comment.