Skip to content
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

Fix installation on Apple silicon Macs #59809

Closed
wants to merge 11 commits into from
Closed

Fix installation on Apple silicon Macs #59809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
57840fd
Update pyobjc to 7.1
hl-tam Feb 24, 2021
eb58366
Update minimum required version of cffi on Darwin
hl-tam Mar 15, 2021
a1e991e
Check $HOMEBREW_PREFIX when linking against libcrypto
hl-tam Feb 24, 2021
4e1e05f
Merge branch 'master' into bigsur-arm-install
krionbsd Mar 17, 2021
5c320d5
Add test case
krionbsd Mar 17, 2021
72ddb41
Add changelog entry
hl-tam Mar 17, 2021
9cc5993
Make _find_libcrypto fail on Big Sur if it can't find a library
hl-tam Mar 17, 2021
be1dabd
Update _find_libcrypto tests
hl-tam Mar 17, 2021
e820980
Fix description of test_find_libcrypto_with_system_before_catalina
hl-tam Mar 19, 2021
449a39f
Patch sys.platform for test_rsax931 tests
Ch3LL Mar 22, 2021
0fc513b
Merge branch 'master' into bigsur-arm-install
hl-tam Apr 14, 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
1 change: 1 addition & 0 deletions changelog/59808.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed installation on Apple Silicon Macs by checking $HOMEBREW_PREFIX for `libcrypto` instead of assuming /usr/local.
3 changes: 2 additions & 1 deletion requirements/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ apache-libcloud>=2.4.0
backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7'
cherrypy>=17.4.1
cryptography>=2.6.1
cffi>=1.14.4
gitpython>=2.1.15
idna>=2.8
linode-python>=1.1.1
Expand All @@ -19,4 +20,4 @@ python-gnupg>=0.4.4
setproctitle>=1.1.10
timelib>=0.2.5
vultr>=1.0.1
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.5/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2020.6.20
certvalidator==0.11.1 # via vcert
cffi==1.12.2
cffi==1.14.5
cfn-lint==0.44.3 # via moto
chardet==3.0.4
cheetah3==3.1.0
Expand Down Expand Up @@ -232,4 +232,4 @@ yamlordereddictloader==0.4.0
zc.lockfile==2.0
zipp==0.6.0 # via importlib-metadata, importlib-resources, moto
# Passthrough dependencies from requirements/static/pkg/py3.5/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.6/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2020.6.20
certvalidator==0.11.1 # via vcert
cffi==1.12.2
cffi==1.14.5
cfn-lint==0.44.3 # via moto
chardet==3.0.4
cheetah3==3.1.0
Expand Down Expand Up @@ -231,4 +231,4 @@ yamlordereddictloader==0.4.0
zc.lockfile==2.0
zipp==0.6.0 # via importlib-metadata, importlib-resources, moto
# Passthrough dependencies from requirements/static/pkg/py3.6/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.7/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2020.6.20
certvalidator==0.11.1 # via vcert
cffi==1.12.2
cffi==1.14.5
cfn-lint==0.44.3 # via moto
chardet==3.0.4
cheetah3==3.1.0
Expand Down Expand Up @@ -232,4 +232,4 @@ yamlordereddictloader==0.4.0
zc.lockfile==2.0
zipp==0.6.0 # via importlib-metadata, moto
# Passthrough dependencies from requirements/static/pkg/py3.7/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.8/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ cachetools==3.1.0 # via google-auth
cassandra-driver==3.23.0
certifi==2020.6.20
certvalidator==0.11.1 # via vcert
cffi==1.12.2
cffi==1.14.5
cfn-lint==0.44.3 # via moto
chardet==3.0.4
cheetah3==3.1.0
Expand Down Expand Up @@ -231,4 +231,4 @@ yamlordereddictloader==0.4.0
zc.lockfile==2.0
zipp==3.4.0 # via moto
# Passthrough dependencies from requirements/static/pkg/py3.8/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,4 @@ yamlordereddictloader==0.4.0
zc.lockfile==2.0
zipp==3.4.0 # via moto
# Passthrough dependencies from requirements/static/pkg/py3.9/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/pkg/py3.5/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
apache-libcloud==2.5.0
backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
certifi==2020.6.20 # via requests
cffi==1.12.2 # via cryptography
cffi==1.14.5
chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
Expand Down Expand Up @@ -47,4 +47,4 @@ urllib3==1.24.3 # via requests
vultr==1.0.1
zc.lockfile==2.0 # via cherrypy
# Passthrough dependencies from requirements/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/pkg/py3.6/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
apache-libcloud==2.5.0
backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
certifi==2020.6.20 # via requests
cffi==1.12.2 # via cryptography
cffi==1.14.5
chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
Expand Down Expand Up @@ -47,4 +47,4 @@ urllib3==1.24.3 # via requests
vultr==1.0.1
zc.lockfile==2.0 # via cherrypy
# Passthrough dependencies from requirements/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/pkg/py3.7/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
apache-libcloud==2.5.0
certifi==2020.6.20 # via requests
cffi==1.12.2 # via cryptography
cffi==1.14.5
chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
Expand Down Expand Up @@ -44,4 +44,4 @@ urllib3==1.24.3 # via requests
vultr==1.0.1
zc.lockfile==2.0 # via cherrypy
# Passthrough dependencies from requirements/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/pkg/py3.8/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
apache-libcloud==2.5.0
certifi==2020.6.20 # via requests
cffi==1.12.2 # via cryptography
cffi==1.14.5
chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
Expand Down Expand Up @@ -44,4 +44,4 @@ urllib3==1.24.3 # via requests
vultr==1.0.1
zc.lockfile==2.0 # via cherrypy
# Passthrough dependencies from requirements/darwin.txt
pyobjc==6.2.2
pyobjc==7.1
4 changes: 2 additions & 2 deletions requirements/static/pkg/py3.9/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
apache-libcloud==2.5.0
certifi==2020.6.20 # via requests
cffi==1.14.4 # via cryptography
cffi==1.14.4
chardet==3.0.4 # via requests
cheroot==8.3.0 # via cherrypy
cherrypy==17.4.1
Expand Down Expand Up @@ -44,4 +44,4 @@ urllib3==1.24.3 # via requests
vultr==1.0.1
zc.lockfile==2.0 # via cherrypy
# Passthrough dependencies from requirements/darwin.txt
pyobjc==6.2.2
pyobjc==7.1