Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V3.1.0 1 #36

Merged
merged 7 commits into from Feb 7, 2019
Merged

V3.1.0 1 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c64d8eb
version 3.1.1
dnadeau4 Feb 6, 2019
fc9ecb6
add conda_build_config.yaml
dnadeau4 Feb 6, 2019
e586d7c
fix conda upload for new recipe
dnadeau4 Feb 6, 2019
2791eef
unpin conda-build to get the latest
dnadeau4 Feb 6, 2019
b7f4af7
only need to upload once
dnadeau4 Feb 7, 2019
3b1b39c
upload cdtime once
dnadeau4 Feb 7, 2019
8622aef
add conda-upload to macos py3
dnadeau4 Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Expand Up @@ -88,7 +88,6 @@ jobs:
- run: *create_conda_env
- run: *setup_cdtime
- run: *run_cdtime_tests
- run: *upload_cdtime
- store_artifacts:
path: tests_html
destination: tests_html
Expand Down Expand Up @@ -124,7 +123,6 @@ jobs:
- run: *create_conda_env
- run: *setup_cdtime
- run: *run_cdtime_tests
- run: *upload_cdtime
- store_artifacts:
path: tests_html
destination: tests_html
Expand Down Expand Up @@ -160,5 +158,4 @@ workflows:
requires:
- linux_cdtime_py2



7 changes: 3 additions & 4 deletions ci-support/conda_upload.sh
View file
Open in desktop
@@ -1,13 +1,13 @@
#!/usr/bin/env bash
PKG_NAME=cdtime
USER=cdat
export VERSION="3.1.0"
export VERSION="3.1.1"
echo "Trying to upload to conda"
echo ""
echo "Activating base env"
source activate base
echo "Making sure conda-build is installed"
conda install "conda-build<3.10"
conda install conda-build
echo "Updating conda"
conda update -y -q conda
if [ `uname` == "Linux" ]; then
Expand Down Expand Up @@ -35,6 +35,5 @@ ln -s ../recipe cdtime
export BRANCH=${CIRCLE_BRANCH}
python ./prep_for_build.py -b ${BRANCH}

conda build ${PKG_NAME} -c cdat/label/unstable -c conda-forge --python 2.7
conda build ${PKG_NAME} -c cdat/label/unstable -c conda-forge --python 3.6
conda build ${PKG_NAME} -c cdat/label/unstable -c cdat/label/nightly -c conda-forge
anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l $LABEL $CONDA_BLD_PATH/$OS/${PKG_NAME}-$VERSION.`date +%Y*`0.tar.bz2 --force
8 changes: 8 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
@@ -0,0 +1,8 @@
python:
- 3.7
- 3.6
- 2.7

numpy:
- 1.14