Skip to content

Commit 6400e4a

Browse files
Merge branch 'master' into 2.2.4
2 parents 734dffc + e52c3a0 commit 6400e4a

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

.vscode/settings.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

conda/conda_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ else
2020
fi
2121
echo "Building" $VERSION"-"$BUILD_NAME "for label:" $TAG
2222

23-
conda build -c conda-forge -c e3sm -c cdat -c cdat/label/v81 .
23+
conda build -c conda-forge -c e3sm -c cdat/label/v82 .
2424

2525
if [ $? -eq 1 ]; then
2626
echo "conda build failed"
@@ -31,4 +31,4 @@ if [ ! -z "$1" ]; then
3131
anaconda upload -u $USER -l "$1" $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2
3232
else
3333
anaconda upload -u $USER $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2
34-
fi
34+
fi

conda/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ about:
1717

1818
requirements:
1919
host:
20-
- python>=3
20+
- python
2121
- pip
2222

2323
run:
24-
- python>=3
24+
- python
2525
- mpas-analysis >=1.2.5
2626
- nco >=4.8.1
2727
- e3sm_diags >=1.7.1

0 commit comments

Comments
 (0)