Re-enable basemap, update default version

CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Update example Miniforge version to 25.3.0-3
+- Update example Python version to 3.13
+- Re-enable `basemap` installation by default
+  - This is now possible as `basemap` has been updated to support `numpy` v2
+- Rename `always_circular_stereo.py` to `cartopy_example.py`
+
 ### Added
 
 - Explicit Pip Packages

install_miniforge.bash

@@ -72,13 +72,13 @@ fi
 # Usage
 # -----
 
-EXAMPLE_PY_VERSION="3.12"
-EXAMPLE_MINI_VERSION="24.11.3-0"
+EXAMPLE_PY_VERSION="3.13"
+EXAMPLE_MINI_VERSION="25.3.0-3"
 EXAMPLE_INSTALLDIR="/opt/GEOSpyD"
 EXAMPLE_DATE=$(date +%F)
 usage() {
    echo "Usage: $0 --python_version <python version> --miniforge_version <miniforge> --prefix <prefix>"
-   echo "                   [--micromamba | --mamba] [--blas <blas>] [--ffnet-hack] [--basemap]"
+   echo "                   [--micromamba | --mamba] [--blas <blas>] [--ffnet-hack]"
    echo ""
    echo "   Required arguments:"
    echo "      --python_version <python version> (e.g., ${EXAMPLE_PY_VERSION})"
@@ -90,7 +90,6 @@ usage() {
    echo "      --micromamba: Use micromamba installer (default)"
    echo "      --mamba: Use mamba installer"
    echo "      --ffnet-hack: Install ffnet from fork (used on Bucy due to odd issue not finding gfortran)"
-   echo "      --basemap: Install basemap (which downgrades numpy to v1 which prevents some packages from installing)"
    echo "      --help: Print this message"
    echo ""
    echo "   By default we use the micromamba installer on both Linux and macOS"
@@ -160,7 +159,6 @@ fi
 USE_MAMBA=FALSE
 USE_MICROMAMBA=TRUE
 FFNET_HACK=FALSE
-INSTALL_BASEMAP=FALSE
 
 while [[ $# -gt 0 ]]
 do
@@ -184,9 +182,6 @@ do
       --ffnet-hack)
          FFNET_HACK=TRUE
          ;;
-      --basemap)
-         INSTALL_BASEMAP=TRUE
-         ;;
       --prefix)
          MINIFORGE_DIR=$2
          shift
@@ -557,13 +552,7 @@ $PACKAGE_INSTALL psycopg2 gdal xarray geotiff plotly
 $PACKAGE_INSTALL iris pyhdf biggus hpccm cdsapi
 $PACKAGE_INSTALL babel beautifulsoup4 colorama gmp jupyter jupyterlab
 $PACKAGE_INSTALL movingpandas geoviews hvplot">=0.11.0" geopandas bokeh
-# We only install skimpy if the user does not ask for basemap, as it downgrades numpy
-# to v1. So if asked we install it, if not, we can install other
-# packages that need numpy v2 (e.g., skimpy)
-if [[ $INSTALL_BASEMAP == FALSE ]]
-then
-   $PACKAGE_INSTALL skimpy
-fi
+$PACKAGE_INSTALL skimpy
 $PACKAGE_INSTALL intake intake-parquet intake-xarray
 
 # Looks like mo_pack, libmo_pack, pyspharm, windspharm are not available on arm64
@@ -676,13 +665,7 @@ $PIP_INSTALL lxml
 $PIP_INSTALL juliandate
 $PIP_INSTALL pybufrkit
 $PIP_INSTALL pyephem
-# We only install Basemap if the user asks as it downgrades numpy
-# to v1. So if asked we install it, if not, we can install other
-# packages that need numpy v2 (e.g., skimpy)
-if [[ $INSTALL_BASEMAP == TRUE ]]
-then
-   $PIP_INSTALL basemap
-fi
+$PIP_INSTALL basemap
 $PIP_INSTALL redis
 $PIP_INSTALL Flask
 $PIP_INSTALL goes2go