Skip to content
Closed
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
27 changes: 14 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@ jobs:
- checkout

- run:
name: Install MiniForge
name: Install micromamba
shell: /bin/bash -xl
command: |
apt update --yes && apt upgrade --yes
apt install --yes --no-install-recommends wget ca-certificates git

cd ${HOME}
wget -O Miniforge3.sh \
"https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
bash Miniforge3.sh -b -p "${HOME}/conda"

# Put mamba's shell init into a profile.d file, in order to activate
# it even in non-interactive terminals
"${HOME}/conda/bin/mamba" shell hook --shell bash --root-prefix "${HOME}/conda" \
> /etc/profile.d/mamba-raider-circleci.sh
echo "mamba activate RAiDER" >> /etc/profile.d/mamba-raider-circleci.sh
# Put micromamba's shell init script into a profile.d file instead
# of .bashrc, in order to activate it even in CircleCI's
# non-interactive terminals.
mv ${HOME}/.bashrc ${HOME}/.bashrc.tmp &> /dev/null
# From https://mamba.readthedocs.io/en/latest/installation/micromamba-installation.html#automatic-install
curl -L micro.mamba.pm/install.sh | "${SHELL}"
mv ${HOME}/.bashrc /etc/profile.d/mamba-raider-circleci.sh
mv ${HOME}/.bashrc.tmp ${HOME}/.bashrc &> /dev/null

- run:
name: Create RAiDER environment
no_output_timeout: 60m
shell: /bin/bash -xl
command: |
PYTHON_VERSION="<< parameters.python-version >>"
sed -i "/python>=/c\ - python=${PYTHON_VERSION}" environment.yml
mamba env create -f environment.yml
# Create RAiDER enivronment
micromamba env create --yes -f environment.yml python=${PYTHON_VERSION}
# Activate the RAiDER env for the rest of the script's shells
echo "micromamba activate RAiDER" >> /etc/profile.d/mamba-raider-circleci.sh

- run:
name: Install RAiDER and check environment
Expand Down Expand Up @@ -69,6 +69,7 @@ jobs:
name: Report coverage
shell: /bin/bash -xl
command: |
# Only run the coverage test on the latest supported version (3.12)
PYTHON_VERSION="<< parameters.python-version >>"
if [ "${PYTHON_VERSION}" == "3.12" ]; then
python -m pip install coveralls
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* [743](https://github.com/dbekaert/RAiDER/pull/743) - Switched from HTTPS to DAP4 for retrieving MERRA2 data, and suppressed a warning for using DAP4 for GMAO data where doing so is not possible.

### Fixed
* [759](https://github.com/dbekaert/RAiDER/pull/759) - Added a `browse` S3 tag for `.png` files when uploaded to AWS.
* [759](https://github.com/dbekaert/RAiDER/pull/759) - Added a `browse_images` S3 tag for `.png` files when uploaded to AWS.
* [757](https://github.com/dbekaert/RAiDER/pull/757) - Switched to micromamba in CircleCI tests to fix configuration issue experienced with MiniForge.
* [741](https://github.com/dbekaert/RAiDER/pull/741) - Updated mamba setup commands in CircleCI for mamba 2.0.0.
* [738](https://github.com/dbekaert/RAiDER/pull/738) - Resolved an InsecureRequestWarning when fetching data through CDS, such as for ERA5.
* [734](https://github.com/dbekaert/RAiDER/pull/734) - Resolved a deprecation warning from Rasterio about the use of `statistics()`.
Expand Down
74 changes: 37 additions & 37 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,62 +9,62 @@ channels:
- nodefaults
dependencies:
- python>=3.8
- pip
- pip>=25
# For running
- asf_search
- boto3
- asf_search>=9
- boto3>=1
- cartopy
- cdsapi
- cfgrib
- dask
- dem_stitcher>=2.5.8
- ecmwf-api-client
- h5netcdf
- h5py
- ecmwf-api-client>=1
- h5netcdf>=1
- h5py>=2
- herbie-data<2025.2.1
- isce3>=0.15.0
- jsonschema==3.2.0 # this is for ASF DAAC ingest schema validation
- lxml
- matplotlib
- netcdf4
- numpy
- pandas
- progressbar
- pydap>3.2.2
- jsonschema>=3.2.0 # this is for ASF DAAC ingest schema validation
- lxml>=6
- matplotlib>=3
- netcdf4>=1
- numpy>=1
- pandas>=2
- progressbar>=2
- pydap>=3.2.3
- pyproj>=2.2.0
- pyyaml
- pyyaml>=6
- rasterio>=1.3.0
- requests
- requests>=2
- rioxarray
- s3fs
- scipy>1.10.0
- scipy>=1.10.1
- s1_orbits
- shapely
- tqdm
- shapely>=2
- tqdm>=4
- xarray
# For packaging and testing
- autopep8
- cmake
- cxx-compiler
- cython
- pybind11
- pytest
- pytest-console-scripts
- pytest-cov
- pytest-mock
- pytest-timeout
- autopep8>=2
- cmake>=4
- cxx-compiler>=1
- cython>=3
- pybind11>=2
- pytest>=8
- pytest-console-scripts>=1
- pytest-cov>=6
- pytest-mock>=3
- pytest-timeout>=2
- setuptools_scm>=6.2
- sysroot_linux-64
- sysroot_linux-64>=2
# For docs website
- mkdocs
- mkdocs-macros-plugin
- mkdocs-material
- mkdocs-material-extensions
- mkdocs>=1
- mkdocs-macros-plugin>=1
- mkdocs-material>=9
- mkdocs-material-extensions>=1
- mkdocstrings
- mkdocstrings-python
- mkdocstrings-python>=1
# For RAiDER-docs
- jupyter_contrib_nbextensions
- jupyterlab
- jupyterlab>=3
- wand
# For development
- boto3-stubs
- boto3-stubs>=1
Loading