Skip to content

Commit 9fe6a93

Browse files
authored
Merge pull request #15 from UV-CDAT/issue_10_exception
update conda-upload to use conda-build 3.2.2
2 parents 9a227db + b7e0289 commit 9fe6a93

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

ci-support/conda_upload.sh

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,12 @@ cd conda-recipes
3434
# uvcdat creates issues for build -c uvcdat confises package and channel
3535
rm -rf uvcdat
3636
python ./prep_for_build.py -v $(date +%Y.%m.%d)
37+
#
3738
echo "Building and uploading now"
3839
#
3940
# use variant configuration in conda_build_config.yaml
41+
# Bug in conda-build 3.3.0 can be avoided with 3.2.2 on OSX
4042
#
41-
conda build -c conda-forge -m cdtime/conda_build_config.yaml ${PKG_NAME}
42-
#--numpy=1.13 --python=2.7
43-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.12 --python=2.7
44-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.11 --python=2.7
45-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.10 --python=2.7
46-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.9 --python=2.7
47-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.13 --python=3.6
48-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.12 --python=3.6
49-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.11 --python=3.6
50-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.10 --python=3.6
51-
#conda build -c conda-forge ${PKG_NAME} --numpy=1.9 --python=3.6
43+
conda install conda-build==3.2.2
44+
conda build -c conda-forge ${PKG_NAME}
5245
anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-$(date +%Y.%m.%d)-*_0.tar.bz2 --force

0 commit comments

Comments
 (0)