diff --git a/.github/workflows/mopper-conda-release.yaml b/.github/workflows/mopper-conda-release.yaml new file mode 100644 index 0000000..7e070d2 --- /dev/null +++ b/.github/workflows/mopper-conda-release.yaml @@ -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/checkout@v4.1.7 + 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/setup-miniconda@v3.0.4 + 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/action-build-and-upload-conda-packages@v1.3.0 + 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 diff --git a/.github/workflows/mopper-pytest.yaml b/.github/workflows/mopper-pytest.yaml index 51d846c..44e2b5e 100644 --- a/.github/workflows/mopper-pytest.yaml +++ b/.github/workflows/mopper-pytest.yaml @@ -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: diff --git a/README.md b/README.md index 159a3c5..12b0d94 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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: @@ -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. diff --git a/conda/meta.yaml b/conda/meta.yaml index bf5e2cd..479c1f7 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: mopper - version: "{{ environ.get('GIT_DESCRIBE_TAG', '0.9') }}" + version: "{{ environ.get('GIT_DESCRIBE_TAG', '1.0') }}" #source: # path: ./ @@ -8,9 +8,9 @@ package: 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: diff --git a/src/mopdata/cmor_tables/CM2_3hr.json b/src/mopdata/cmor_tables/CM2_3hr.json index dd13bab..34584c2 100644 --- a/src/mopdata/cmor_tables/CM2_3hr.json +++ b/src/mopdata/cmor_tables/CM2_3hr.json @@ -104,10 +104,7 @@ "valid_max": "", "ok_min_mean_abs": "", "ok_max_mean_abs": "" - }, - - - + } } }