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

Jump to bottom

In devel or devel_server installations, read requirements from master if --version is not passed to install.py #9024

Merged
merged 2 commits into from
Sep 21, 2023
Merged

In devel or devel_server installations, read requirements from master if --version is not passed to install.py #9024

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad60993
In devel or devel_server installations, if --version is not passed to…
ptormene Sep 21, 2023
da77ac6
Merge remote-tracking branch 'origin/master' into fix-installation-mi…
ptormene Sep 21, 2023
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
6 changes: 4 additions & 2 deletions install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,13 @@ def ensure(pip=None, pyvenv=None):
% sys.executable))


def get_branch(version):
def get_branch(version, inst):
"""
Convert "version" into a branch name
"""
if version is None:
if (inst is devel or inst is devel_server):
return 'master'
# retrieve the tag name of the current stable version
with urlopen('https://pypi.org/pypi/openquake.engine/json') as resp:
content = resp.read()
Expand Down Expand Up @@ -381,7 +383,7 @@ def install(inst, version):
'pip', 'wheel'])

# install the requirements
branch = get_branch(version)
branch = get_branch(version, inst)
if sys.platform == 'darwin':
mac = '_' + platform.machine(), # x86_64 or arm64
else:
Expand Down
Loading