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/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/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 new file mode 100755 index 0000000..015ea7f --- /dev/null +++ b/conda/conda_build.sh @@ -0,0 +1,32 @@ +export VERSION="1.0" +export BUILD_NAME="rc2" +export CONDA_BLD_PATH=~/conda-bld +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 -c cdat -l "$1" $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 +else + anaconda upload -c cdat $CONDA_BLD_PATH/$PLATFORM/$PKG-$VERSION-$BUILD_NAME.tar.bz2 +fi diff --git a/conda/meta.yaml.in b/conda/meta.yaml.in index b39444d..9c42c13 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: @@ -13,15 +13,18 @@ requirements: - nodejs run: - python =2 + - nodejs - flask - - vcs - - cdms2 + - vcs 8.0 + - cdms2 3.0 + - cdutil 8.0 + - genutil 8.1 + - service_identity + - vcsaddons 8.0 - vcs-js - - genutil - - proj4 <5 build: noarch_python: true about: - home: http://github.com/UV-CDAT/vcdat + home: http://github.com/CDAT/vcdat diff --git a/conda/meta.yaml.official b/conda/meta.yaml.official index bfa1617..95a5bfd 100644 --- a/conda/meta.yaml.official +++ b/conda/meta.yaml.official @@ -1,24 +1,26 @@ 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 + - python =2 - setuptools - nodejs run: - - python + - python =2 + - nodejs - flask - - vcs 2.12 - - cdms2 2.12 - - cdutil 2.12 - - genutil 2.12 + - vcs 8.0 + - cdms2 3.0 + - cdutil 8.0 + - genutil 8.1 + - service_identity + - vcsaddons 8.0 - 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 diff --git a/scripts/setup.sh b/scripts/setup.sh index 6492a3f..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 --file $current_dir/backend/requirements.txt + conda create -y -n ${CONDA_ENV} -c cdat/label/nightly -c conda-forge -c cdat vcdat source activate ${CONDA_ENV} cd frontend