From 806312f51f39f39a1c8cd7f48dd631afee3f72b2 Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 14:26:02 -0700 Subject: [PATCH 01/10] update requirements --- conda/meta.yaml.official | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml.official b/conda/meta.yaml.official index bfa1617..508bbb4 100644 --- a/conda/meta.yaml.official +++ b/conda/meta.yaml.official @@ -9,12 +9,15 @@ requirements: - setuptools - nodejs run: - - python + - python=2 + - nodejs - flask - vcs 2.12 - cdms2 2.12 - cdutil 2.12 - genutil 2.12 + - service_identity + - vcsaddons - vcs-js source: git_rev: v0.0.4 From 7f4337f1d441012332fc351dde77e2dd33b9f742 Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 14:34:54 -0700 Subject: [PATCH 02/10] build script update --- .gitignore | 2 +- conda/conda_build.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 conda/conda_build.sh diff --git a/.gitignore b/.gitignore index 3b98c84..d8590e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .DS_Store -node_modules +*node_modules/* *.pyc backend/venv frontend/dist diff --git a/conda/conda_build.sh b/conda/conda_build.sh new file mode 100644 index 0000000..3587809 --- /dev/null +++ b/conda/conda_build.sh @@ -0,0 +1,33 @@ +export VERSION="1.0" +export BUILD_NAME="rc2" +export CONDA_BLD_PATH=~/conda-bld +USER="downiec" +PLATFORM="osx-64" +PKG="vcdat" + +if [ -d $CONDA_BLD_PATH ]; then + rm -rf $CONDA_BLD_PATH +fi +echo "Creating build dir at" $CONDA_BLD_PATH +mkdir $CONDA_BLD_PATH + +conda config --set anaconda_upload no +if [ ! -z "$1" ]; then + export TAG="$1" +else + export TAG="master" +fi +echo "Building" $VERSION"-"$BUILD_NAME "for label:" $TAG + +conda build -c conda-forge -c cdat . + +if [ $? -eq 1 ]; then + echo "conda build failed" + exit +fi + +if [ ! -z "$1" ]; then + anaconda upload -u $USER -l "$1" $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 +else + anaconda upload -u $USER $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 +fi From 7feda20cfa9b7759472d184c5f9dd1eddeeb0025 Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 14:37:35 -0700 Subject: [PATCH 03/10] add meta.yaml --- conda/{meta.yaml.official => meta.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename conda/{meta.yaml.official => meta.yaml} (96%) diff --git a/conda/meta.yaml.official b/conda/meta.yaml similarity index 96% rename from conda/meta.yaml.official rename to conda/meta.yaml index 508bbb4..348f149 100644 --- a/conda/meta.yaml.official +++ b/conda/meta.yaml @@ -5,7 +5,7 @@ package: version: "0.7.0" requirements: build: - - python + - python=2 - setuptools - nodejs run: From 4f01e5da51a3c06a4b1ecb3cb7bc40143ef71754 Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 14:41:49 -0700 Subject: [PATCH 04/10] remove version pinning --- conda/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 348f149..74a2155 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -12,10 +12,10 @@ requirements: - python=2 - nodejs - flask - - vcs 2.12 - - cdms2 2.12 - - cdutil 2.12 - - genutil 2.12 + - vcs + - cdms2 + - cdutil + - genutil - service_identity - vcsaddons - vcs-js From 945febc080ff88e5c42ab35473c60502a9ec943f Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 15:52:13 -0700 Subject: [PATCH 05/10] updated meta files for conda upload --- conda/meta.yaml.in | 13 ++++++++----- conda/{meta.yaml => meta.yaml.official} | 7 +++---- 2 files changed, 11 insertions(+), 9 deletions(-) rename conda/{meta.yaml => meta.yaml.official} (68%) diff --git a/conda/meta.yaml.in b/conda/meta.yaml.in index b39444d..da4ecab 100644 --- a/conda/meta.yaml.in +++ b/conda/meta.yaml.in @@ -4,7 +4,7 @@ package: source: git_rev: @UVCDAT_BRANCH@ - git_url: git://github.com/UV-CDAT/vcdat.git + git_url: git://github.com/CDAT/vcdat.git requirements: build: @@ -12,16 +12,19 @@ requirements: - setuptools - nodejs run: - - python =2 + - python=2 + - nodejs - flask - vcs - cdms2 - - vcs-js + - cdutil - genutil - - proj4 <5 + - service_identity + - vcsaddons + - vcs-js build: noarch_python: true about: - home: http://github.com/UV-CDAT/vcdat + home: http://github.com/CDAT/vcdat diff --git a/conda/meta.yaml b/conda/meta.yaml.official similarity index 68% rename from conda/meta.yaml rename to conda/meta.yaml.official index 74a2155..79b27c7 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml.official @@ -1,8 +1,8 @@ about: - home: http://github.com/UV-CDAT/vcdat + home: http://github.com/CDAT/vcdat package: name: vcdat - version: "0.7.0" + version: "1.0" requirements: build: - python=2 @@ -20,8 +20,7 @@ requirements: - vcsaddons - vcs-js source: - git_rev: v0.0.4 - git_url: git://github.com/UV-CDAT/vcdat.git + git_url: git://github.com/CDAT/vcdat.git build: noarch_python: false number: 1 From 6753a814abefba107abae36b0588f61744092a80 Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 16:09:14 -0700 Subject: [PATCH 06/10] Update conda build script for conda upload automation --- conda/conda_build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conda/conda_build.sh b/conda/conda_build.sh index 3587809..015ea7f 100644 --- a/conda/conda_build.sh +++ b/conda/conda_build.sh @@ -1,7 +1,6 @@ export VERSION="1.0" export BUILD_NAME="rc2" export CONDA_BLD_PATH=~/conda-bld -USER="downiec" PLATFORM="osx-64" PKG="vcdat" @@ -27,7 +26,7 @@ if [ $? -eq 1 ]; then fi if [ ! -z "$1" ]; then - anaconda upload -u $USER -l "$1" $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 + anaconda upload -c cdat -l "$1" $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 else - anaconda upload -u $USER $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 + anaconda upload -c cdat $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 fi From e726c9bf3a38cbdd91e7c009ea467eb6368b1526 Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 16:23:25 -0700 Subject: [PATCH 07/10] Removed unecessary requirements.txt file and updated setup.sh accordingly. --- backend/requirements.txt | 11 ----------- scripts/setup.sh | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 backend/requirements.txt diff --git a/backend/requirements.txt b/backend/requirements.txt deleted file mode 100644 index 1ffa942..0000000 --- a/backend/requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -# This file may be used to create an environment using: -# $ conda create --name --file -# Release package=current_release - -cdms2 -vcs -vcs-js -nodejs -flask -service_identity -vcsaddons \ No newline at end of file diff --git a/scripts/setup.sh b/scripts/setup.sh index 6492a3f..b01b89e 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -47,7 +47,7 @@ if [[ $current_dir == */vcdat* ]]; then conda env remove -y -n ${CONDA_ENV} # Create a new one - conda create -y -n ${CONDA_ENV} -c cdat/label/nightly -c conda-forge -c cdat --file $current_dir/backend/requirements.txt + conda create -y -n ${CONDA_ENV} -c cdat/label/nightly -c conda-forge -c cdat source activate ${CONDA_ENV} cd frontend From fc9d04f48d821eb75db6713c019770e646fcff61 Mon Sep 17 00:00:00 2001 From: Downie Date: Mon, 22 Oct 2018 17:32:47 -0700 Subject: [PATCH 08/10] Added tags and syntax update. --- conda/meta.yaml.in | 12 ++++++------ conda/meta.yaml.official | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conda/meta.yaml.in b/conda/meta.yaml.in index da4ecab..9c42c13 100644 --- a/conda/meta.yaml.in +++ b/conda/meta.yaml.in @@ -12,15 +12,15 @@ requirements: - setuptools - nodejs run: - - python=2 + - python =2 - nodejs - flask - - vcs - - cdms2 - - cdutil - - genutil + - vcs 8.0 + - cdms2 3.0 + - cdutil 8.0 + - genutil 8.1 - service_identity - - vcsaddons + - vcsaddons 8.0 - vcs-js build: diff --git a/conda/meta.yaml.official b/conda/meta.yaml.official index 79b27c7..95a5bfd 100644 --- a/conda/meta.yaml.official +++ b/conda/meta.yaml.official @@ -5,19 +5,19 @@ package: version: "1.0" requirements: build: - - python=2 + - python =2 - setuptools - nodejs run: - - python=2 + - python =2 - nodejs - flask - - vcs - - cdms2 - - cdutil - - genutil + - vcs 8.0 + - cdms2 3.0 + - cdutil 8.0 + - genutil 8.1 - service_identity - - vcsaddons + - vcsaddons 8.0 - vcs-js source: git_url: git://github.com/CDAT/vcdat.git From e9eccd39103f1954e866de858d62213b881196ac Mon Sep 17 00:00:00 2001 From: Downie Date: Thu, 1 Nov 2018 14:16:58 -0700 Subject: [PATCH 09/10] updated setup.sh --- scripts/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index b01b89e..bc8e4bf 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -47,7 +47,7 @@ if [[ $current_dir == */vcdat* ]]; then conda env remove -y -n ${CONDA_ENV} # Create a new one - conda create -y -n ${CONDA_ENV} -c cdat/label/nightly -c conda-forge -c cdat + conda create -y -n ${CONDA_ENV} -c cdat/label/nightly -c conda-forge -c cdat vcdat source activate ${CONDA_ENV} cd frontend From 3fd25f7a27622dce0480d4018a06976b9956c224 Mon Sep 17 00:00:00 2001 From: Downie Date: Fri, 2 Nov 2018 09:55:50 -0700 Subject: [PATCH 10/10] Made build and conda_build scripts executable. --- conda/build.sh | 0 conda/conda_build.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 conda/build.sh mode change 100644 => 100755 conda/conda_build.sh diff --git a/conda/build.sh b/conda/build.sh old mode 100644 new mode 100755 diff --git a/conda/conda_build.sh b/conda/conda_build.sh old mode 100644 new mode 100755