-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #177 from xylar/update-to-0.3.0-alpha.1
Update to 0.3.0-alpha.1
- Loading branch information
Showing
38 changed files
with
665 additions
and
221 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,6 +88,7 @@ jobs: | |
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }} | ||
name: Install polaris | ||
run: | | ||
git config --global url."https://github.com/".insteadOf "[email protected]:" | ||
./configure_polaris_envs.py \ | ||
--conda_env_only \ | ||
--env_name polaris_test \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,6 +44,7 @@ jobs: | |
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }} | ||
name: Install polaris | ||
run: | | ||
git config --global url."https://github.com/".insteadOf "[email protected]:" | ||
./configure_polaris_envs.py \ | ||
--conda_env_only \ | ||
--env_name polaris_test \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,6 @@ | |
[submodule "e3sm_submodules/Omega"] | ||
path = e3sm_submodules/Omega | ||
url = [email protected]:E3SM-Project/Omega.git | ||
[submodule "jigsaw-python"] | ||
path = jigsaw-python | ||
url = [email protected]:dengwirda/jigsaw-python.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,7 +43,12 @@ def setup_install_env(env_name, activate_base, use_local, logger, recreate, | |
channels = '--use-local' | ||
else: | ||
channels = '' | ||
packages = f'jinja2 {mache} packaging progressbar2' | ||
if mache == '': | ||
# development mache so include dependencies | ||
packages = 'importlib_resources jinja2 lxml packaging progressbar2 ' \ | ||
'pyyaml' | ||
else: | ||
packages = f'jinja2 {mache} packaging progressbar2' | ||
if recreate or not os.path.exists(env_path): | ||
print('Setting up a conda environment for installing polaris\n') | ||
commands = f'{activate_base} && ' \ | ||
|
@@ -114,7 +119,8 @@ def main(): | |
f'git clone -b {args.mache_branch} ' \ | ||
f'[email protected]:{args.mache_fork}.git mache && ' \ | ||
f'cd mache && ' \ | ||
f'python -m pip install .' | ||
f'conda install -y --file spec-file.txt && ' \ | ||
f'python -m pip install --no-deps .' | ||
|
||
check_call(commands, logger=logger) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.