Skip to content

Commit ceb0710

Browse files
committed
last fixes before releasing 1.0.0
1 parent b1b825f commit ceb0710

File tree

5 files changed

+51
-17
lines changed

5 files changed

+51
-17
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Build of mopper conda package for new release
2+
3+
# Controls when the action will run.
4+
on:
5+
# Allows you to run this workflow manually from the Actions tab
6+
workflow_dispatch:
7+
8+
jobs:
9+
conda_deployment_with_new_tag:
10+
name: Test conda deployment of package with Python ${{ matrix.python-version }}
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
python-version: ["3.10", "3.11", "3.12"]
15+
steps:
16+
- uses: actions/checkout@v4.1.7
17+
with:
18+
fetch-depth: 0
19+
- name: Set env
20+
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
21+
- name: Conda environment creation and activation
22+
uses: conda-incubator/setup-miniconda@v3.0.4
23+
with:
24+
python-version: ${{ matrix.python-version }}
25+
activate-environment: mopper_env
26+
environment-file: conda/environment.yaml # Path to the build conda environment
27+
show-channel-urls: true #
28+
- name: Build but do not upload the conda packages
29+
uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0
30+
with:
31+
meta_yaml_dir: conda
32+
python-version: ${{ matrix.python-version }} # Values previously defined in `matrix`
33+
user: coecms
34+
label: auto
35+
upload: true
36+
token: ${{ secrets.ANACONDA_TOKEN }} # Replace with the right name of your secret

.github/workflows/mopper-pytest.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ name: mopper-all-tests
44
on:
55
push:
66
branches:
7-
#- prerelease
8-
- class
9-
#pull_request:
10-
# branches:
11-
# - main
12-
# - prerelease
7+
- prerelease
8+
- main
9+
pull_request:
10+
branches:
11+
- main
12+
- prerelease
1313

1414

1515
jobs:

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [ACCESS Model Output Post-Processor (MOPPeR)](https://access-mopper.readthedocs.io/en/latest)
22
[![Read the docs](https://readthedocs.org/projects/access-mopper/badge/?version=latest)](https://access-mopper.readthedocs.io/en/latest/)
3-
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10976467.svg)](https://doi.org/10.5281/zenodo.10976467)
3+
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.12747219.svg)](https://doi.org/10.5281/zenodo.12747219)
44

55
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.
66

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

1616
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.
1717

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

1920
### Install
2021

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

23-
conda install -c accessnri mopper
24+
conda install -c coecms mopper
2425

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

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

3738
module use /g/data3/hh5/public/modules
38-
module load conda/analysis3-unstable
39+
module load conda/analysis3
3940

4041
NB. You need to be a member of the hh5 project to load the modules.

conda/meta.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package:
22
name: mopper
3-
version: "{{ environ.get('GIT_DESCRIBE_TAG', '0.9') }}"
3+
version: "{{ environ.get('GIT_DESCRIBE_TAG', '1.0') }}"
44

55
#source:
66
# path: ./
77

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

1616
build:

src/mopdata/cmor_tables/CM2_3hr.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,7 @@
104104
"valid_max": "",
105105
"ok_min_mean_abs": "",
106106
"ok_max_mean_abs": ""
107-
},
108-
109-
110-
107+
}
111108

112109
}
113110
}

0 commit comments

Comments
 (0)