Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.DS_Store
node_modules
*node_modules/*
*.pyc
backend/venv
frontend/dist
Expand Down
11 changes: 0 additions & 11 deletions backend/requirements.txt

This file was deleted.

Empty file modified conda/build.sh
100644 → 100755
Empty file.
32 changes: 32 additions & 0 deletions conda/conda_build.sh
Original file line number Diff line number Diff line change
@@ -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
15 changes: 9 additions & 6 deletions conda/meta.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
22 changes: 12 additions & 10 deletions conda/meta.yaml.official
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down