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.

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

Update to Miniconda 24.5.0 and add uxarray #21

Merged
merged 1 commit into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Update to Miniconda version to 24.5.0-0
- Make a symlink of `f2py` to `f2py3` to fix an issue with the wrong `f2py` being found sometimes on discover

### Added

- Explicit Conda Packages
- uxarray
- Explicit Pip Packages
- basemap

Expand Down
2 changes: 1 addition & 1 deletion README.GMAO
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The command for installing on ford1 is:

```
$ ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.4.0-0 --prefix /ford1/share/gmao_SIteam/GEOSpyD
$ ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.5.0-0 --prefix /ford1/share/gmao_SIteam/GEOSpyD
```
2 changes: 1 addition & 1 deletion README.NAS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The command for installing on NAS systems is:

```
$ ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.4.0-0 --prefix /nobackup/gmao_SIteam/GEOSpyD
$ ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.5.0-0 --prefix /nobackup/gmao_SIteam/GEOSpyD
```
2 changes: 1 addition & 1 deletion README.NCCS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The command for installing on NCCS system is:

```
$ ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.4.0-0 --prefix /usr/local/other/python/GEOSpyD/
$ ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.5.0-0 --prefix /usr/local/other/python/GEOSpyD/
```
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ We do not
In order to use the install script, you can run:

```
./install_miniconda.bash --python_version 3.12 --miniconda_version 24.4.0-0 --prefix /opt/GEOSpyD
./install_miniconda.bash --python_version 3.12 --miniconda_version 24.5.0-0 --prefix /opt/GEOSpyD
```

will create an install at:
```
/opt/GEOSpyD/24.4.0-0_py3.12/YYYY-MM-DD
/opt/GEOSpyD/24.5.0-0_py3.12/YYYY-MM-DD
```

where YYYY-MM-DD is the date of the install. We use a date so that if
Expand All @@ -30,7 +30,7 @@ Usage: ./install_miniconda.bash --python_version <python version> --miniconda_ve

Required arguments:
--python_version <python version> (e.g., 3.12)
--miniconda_version <miniconda_version version> (e.g., 24.4.0-0)
--miniconda_version <miniconda_version version> (e.g., 24.5.0-0)
--prefix <full path to installation directory> (e.g, /opt/GEOSpyD)

Optional arguments:
Expand All @@ -49,10 +49,10 @@ Usage: ./install_miniconda.bash --python_version <python version> --miniconda_ve
2. The Python version
3. The date of the installation

For example: ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.4.0-0 --prefix /opt/GEOSpyD
For example: ./install_miniconda.bash --python_version 3.12 --miniconda_version 24.5.0-0 --prefix /opt/GEOSpyD

will create an install at:
/opt/GEOSpyD/24.4.0-0_py3.12/2024-03-08
/opt/GEOSpyD/24.5.0-0_py3.12/2024-03-08

NOTE 2: This script will create or substitute a .condarc file in the user's home directory.
If you have an existing .condarc file, it will be restored after installation.
Expand Down
4 changes: 3 additions & 1 deletion install_miniconda.bash
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fi
# -----

EXAMPLE_PY_VERSION="3.12"
EXAMPLE_MINI_VERSION="24.4.0-0"
EXAMPLE_MINI_VERSION="24.5.0-0"
EXAMPLE_INSTALLDIR="/opt/GEOSpyD"
EXAMPLE_DATE=$(date +%F)
usage() {
Expand Down Expand Up @@ -582,6 +582,8 @@ $PACKAGE_INSTALL autopep8
$PACKAGE_INSTALL mdutils
$PACKAGE_INSTALL earthaccess

$PACKAGE_INSTALL uxarray

# Only install pythran on linux. On mac it brings in an old clang
if [[ $MINICONDA_ARCH == Linux ]]
then
Expand Down