Skip to content

Commit

Permalink
Merge pull request #135 from mnlevy1981/no-manage-externals
Browse files Browse the repository at this point in the history
No manage externals
  • Loading branch information
mnlevy1981 authored Sep 19, 2024
2 parents ac54079 + c7ca967 commit 5cad933
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 28 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cupid.egg-info
# Text editor temp files
**/*.swp

externals/

# Documentation
/docs/_build/
/docs/README.md
Expand Down
9 changes: 6 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "manage_externals"]
path = manage_externals
url = https://github.com/ESMCI/manage_externals.git
[submodule "externals/ADF"]
path = externals/ADF
url = https://github.com/NCAR/ADF.git
[submodule "externals/mom6-tools"]
path = externals/mom6-tools
url = https://github.com/NCAR/mom6-tools.git
16 changes: 0 additions & 16 deletions Externals.cfg

This file was deleted.

11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,17 @@ This collaborative effort aims to simplify the user experience of running diagno
To install CUPiD, you need to check out the code and then set up a few environments.
The initial examples have hard-coded paths that require you to be on `casper`.

The code relies on submodules to install `manage_externals` and then uses `manage_externals` for a few packages that are still being developed,
so the `git clone` process is a little more complicated than usual:
The code relies on submodules to install a few packages that are still being developed,
so the `git clone` process requires `--recurse-submodules`:

``` bash
$ git clone --recurse-submodules https://github.com/NCAR/CUPiD.git
$ cd CUPiD
$ ./manage_externals/checkout_externals
```

Then build the necessary conda environments with
Then `cd` into the `CUPiD` directory and build the necessary conda environments with

``` bash
$ cd CUPiD
$ mamba env create -f environments/dev-environment.yml
$ conda activate cupid-dev
$ which cupid-run
Expand All @@ -37,7 +36,7 @@ Notes:
It still feels slower than running `mamba` directly, hence the recommendation to install with `mamba env create` rather than `conda env create`.
If you do not have `mamba` installed, you can still use `conda`... it will just be significantly slower.
(To see what version of conda you have installed, run `conda --version`.)
1. If `./manage_externals/checkout_externals` is not found, run `git submodule update --init` to clone the submodule.
1. If the subdirectories in `externals/` are all empty, run `git submodule update --init` to clone the submodules.
1. If `which cupid-run` returned the error `which: no cupid-run in ($PATH)`, then please run the following:

``` bash
Expand Down
1 change: 1 addition & 0 deletions externals/ADF
Submodule ADF added at b96152
1 change: 1 addition & 0 deletions externals/mom6-tools
Submodule mom6-tools added at cec236
1 change: 0 additions & 1 deletion manage_externals
Submodule manage_externals deleted from 0f884b

0 comments on commit 5cad933

Please sign in to comment.