Skip to content

Commit

Permalink
last fixes before releasing 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
paolap committed Aug 23, 2024
1 parent b1b825f commit ceb0710
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 17 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/mopper-conda-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Build of mopper conda package for new release

# Controls when the action will run.
on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
conda_deployment_with_new_tag:
name: Test conda deployment of package with Python ${{ matrix.python-version }}
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
steps:
- uses: actions/[email protected]
with:
fetch-depth: 0
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Conda environment creation and activation
uses: conda-incubator/[email protected]
with:
python-version: ${{ matrix.python-version }}
activate-environment: mopper_env
environment-file: conda/environment.yaml # Path to the build conda environment
show-channel-urls: true #
- name: Build but do not upload the conda packages
uses: uibcdf/[email protected]
with:
meta_yaml_dir: conda
python-version: ${{ matrix.python-version }} # Values previously defined in `matrix`
user: coecms
label: auto
upload: true
token: ${{ secrets.ANACONDA_TOKEN }} # Replace with the right name of your secret
12 changes: 6 additions & 6 deletions .github/workflows/mopper-pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ name: mopper-all-tests
on:
push:
branches:
#- prerelease
- class
#pull_request:
# branches:
# - main
# - prerelease
- prerelease
- main
pull_request:
branches:
- main
- prerelease


jobs:
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [ACCESS Model Output Post-Processor (MOPPeR)](https://access-mopper.readthedocs.io/en/latest)
[![Read the docs](https://readthedocs.org/projects/access-mopper/badge/?version=latest)](https://access-mopper.readthedocs.io/en/latest/)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10976467.svg)](https://doi.org/10.5281/zenodo.10976467)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.12747219.svg)](https://doi.org/10.5281/zenodo.12747219)

This code is derived from the [APP4](https://doi.org/10.5281/zenodo.7703469), initially created by Peter Uhe for CMIP5, and further developed for CMIP6-era by Chloe Mackallah from CSIRO, O&A Aspendale.

Expand All @@ -15,12 +15,13 @@ Designed for use on ACCESS model output that has been archived using the [ACCESS

Although we retained a differentiation between `custom` and `cmip` mode the main workflow is the same and `mode` is now only another field in the main configuration file.

See [MOPPeR ReadtheDocs](https://access-mopper.readthedocs.io/en/stable/) for the full documentation.

### Install

You can install the latest version of `mopper` directly from conda (accessnri channel)::

conda install -c accessnri mopper
conda install -c coecms mopper

If you want to install an unstable version or a different branch:

Expand All @@ -35,6 +36,6 @@ If you want to install an unstable version or a different branch:
MOPPeR is pre-installed into a Conda environment at NCI. Load it with::

module use /g/data3/hh5/public/modules
module load conda/analysis3-unstable
module load conda/analysis3

NB. You need to be a member of the hh5 project to load the modules.
8 changes: 4 additions & 4 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package:
name: mopper
version: "{{ environ.get('GIT_DESCRIBE_TAG', '0.9') }}"
version: "{{ environ.get('GIT_DESCRIBE_TAG', '1.0') }}"

#source:
# path: ./

source:
#url: https://github.com/ACCESS-Hive/ACCESS-MOPPeR/archive/refs/tags/{{version}}.tar.gz
git_url: https://github.com/ACCESS-Hive/ACCESS-MOPPeR.git
git_tag: prerelease
#git_rev: "{{ version }}"
#git_depth: 1 # (Defaults to -1/not shallow)
#git_tag: prerelease
git_rev: "{{ version }}"
git_depth: 1 # (Defaults to -1/not shallow)
#path: ../

build:
Expand Down
5 changes: 1 addition & 4 deletions src/mopdata/cmor_tables/CM2_3hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,7 @@
"valid_max": "",
"ok_min_mean_abs": "",
"ok_max_mean_abs": ""
},



}

}
}

0 comments on commit ceb0710

Please sign in to comment.