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

bump openssl to 3 #3086

Merged
merged 2 commits into from
Nov 26, 2024
Merged

bump openssl to 3 #3086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e6b85d
bump openssl to 3
HyTurtle Nov 20, 2024
411a569
Update test_prerequisites.py
HyTurtle Nov 26, 2024
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
2 changes: 1 addition & 1 deletion pythonforandroid/prerequisites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def darwin_installer(self):

class OpenSSLPrerequisite(Prerequisite):
name = "openssl"
homebrew_formula_name = "openssl@1.1"
homebrew_formula_name = "openssl@3"
mandatory = dict(linux=False, darwin=True)
installer_is_supported = dict(linux=False, darwin=True)

Expand Down
4 changes: 2 additions & 2 deletions tests/test_prerequisites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def setUp(self):
self.mandatory = dict(linux=False, darwin=True)
self.installer_is_supported = dict(linux=False, darwin=True)
self.prerequisite = OpenSSLPrerequisite()
self.expected_homebrew_formula_name = "openssl@1.1"
self.expected_homebrew_location_prefix = "/opt/homebrew/opt/openssl@1.1"
self.expected_homebrew_formula_name = "openssl@3"
self.expected_homebrew_location_prefix = "/opt/homebrew/opt/openssl@3"

@mock.patch(
"pythonforandroid.prerequisites.Prerequisite._darwin_get_brew_formula_location_prefix"
Expand Down
Loading