Merge pull request #45 from licode/condaforege-issue

Fix issue due to Conda-forge
NSLS-II · Sep 13, 2016 · 3cca774 · 3cca774
2 parents c9e07eb + be87436
commit 3cca774
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 18 deletions.
diff --git a/recipes-dev/bluesky/meta.yaml b/recipes-dev/bluesky/meta.yaml
@@ -40,7 +40,6 @@ test:
     - bluesky
     - bluesky.examples
     - bluesky.callbacks
-    - bluesky.register_mds
 
 about:
   home: https://github.com/NSLS-II/bluesky

diff --git a/recipes-dev/metadatastore/meta.yaml b/recipes-dev/metadatastore/meta.yaml
@@ -32,8 +32,6 @@ test:
     - nslsii_dev_configuration
   imports:
     - metadatastore
-    - metadatastore.api
-    - metadatastore.commands
     - metadatastore.conf
     - metadatastore.examples
     - metadatastore.examples.sample_data

diff --git a/recipes-tag/bluesky/meta.yaml b/recipes-tag/bluesky/meta.yaml
@@ -7,8 +7,7 @@ package:
 source:
     url: https://github.com/NSLS-II/bluesky/archive/v{{ version }}.tar.gz
     fn: bluesky-v{{ version }}.tar.gz
-    sha256: 58b225cce55dd406347736b07e5af6b764d68be5d78e7129ccaec978ced9e9d6
-
+    sha256: e34afe83710d4114e1fbdd24aba6f1c55f232bcd33c647e09d4147e5941c609a
 build:
     number: 0
     script: python setup.py install --single-version-externally-managed --record=record.txt

diff --git a/recipes-tag/databroker/meta.yaml b/recipes-tag/databroker/meta.yaml
@@ -7,7 +7,7 @@ package:
 source:
   url: https://github.com/NSLS-II/databroker/archive/v{{ version }}.tar.gz
   fn: databroker-v{{ version }}.tar.gz
-  sha256: a53c55e304c096029540a5b238d97a78246a9b42deaf3bd2d9ad9a9dc9788114
+  sha256: e08d9e7fc53524de693ac040be236583a6abf0d61f2ebc93de2f7411e2e0941c
 
 build:
   number: 0

diff --git a/recipes-tag/pyxrf/meta.yaml b/recipes-tag/pyxrf/meta.yaml
@@ -7,7 +7,7 @@ package:
 source:
   url: https://github.com/NSLS-II/pyxrf/archive/v{{ version }}.tar.gz
   fn: pyxrf-v{{ version }}.tar.gz
-  sha256: c3d88e9d538cbe4566683fa1bff57fea56f8ecf6285f91d594f38f38d9cf7af7
+  sha256: 50f8adbd9ae8c81e4419a208bfb2718f9f9aba467785c3679cbef3c58e25fde2
 
 build:
   number: 1

diff --git a/scripts/build.py b/scripts/build.py
@@ -455,7 +455,7 @@ def run_build(metas, username, token=None, upload=True, allow_failures=False):
                        '\n\n========== STDERR ==========\n'
                        '\n{}'.format(pformat(stdout), pformat(stderr)))
             logger.error(message)
-            message_slack(message, username, is_error=True)
+            #message_slack(message, username, is_error=True)
             if not allow_failures:
                 sys.exit(1)
         if token and upload:
@@ -471,7 +471,7 @@ def run_build(metas, username, token=None, upload=True, allow_failures=False):
                            '\n\n========== STDERR ==========\n'
                            '\n{}'.format(pformat(stdout), pformat(stderr)))
                 logger.error(message)
-                message_slack(message, username, is_error=True)
+                #message_slack(message, username, is_error=True)
                 upload_failed.append(build_name)
                 continue
             message_slack("Built and Uploaded {}".format(build_name), username)

diff --git a/scripts/nsls2-dev-build.sh b/scripts/nsls2-dev-build.sh
@@ -32,8 +32,8 @@ show_channel_urls: true
 channels:
 - $UPLOAD_CHANNEL
 - lightsource2-tag
-- conda-forge
-- defaults" > $CONDARC_PATH
+- defaults
+- conda-forge" > $CONDARC_PATH
 
 # And set the correct environmental variable that lets us use it
 echo "Exporting CONDARC=$CONDARC_PATH"
@@ -55,6 +55,6 @@ conda install conda-build anaconda-client conda-execute
 export PYTHONUNBUFFERED=1
 
 # execute the dev build
-./repo/scripts/build.py /repo/recipes-dev -u $UPLOAD_CHANNEL --python 2.7 3.4 3.5 --numpy 1.10 1.11 --token $BINSTAR_TOKEN  --slack-channel $SLACK_CHANNEL --slack-token $SLACK_TOKEN
+./repo/scripts/build.py /repo/recipes-dev -u $UPLOAD_CHANNEL --python 2.7 3.4 3.5 --numpy 1.10 1.11 --token $BINSTAR_TOKEN  --slack-channel $SLACK_CHANNEL --slack-token $SLACK_TOKEN --allow-failures
 
 EOF
diff --git a/scripts/nsls2-tag-build.sh b/scripts/nsls2-tag-build.sh
@@ -31,8 +31,8 @@ always_yes: true
 show_channel_urls: true
 channels:
 - $UPLOAD_CHANNEL
-- conda-forge
-- defaults" > $CONDARC_PATH
+- defaults
+- conda-forge" > $CONDARC_PATH
 
 # And set the correct environmental variable that lets us use it
 echo "Exporting CONDARC=$CONDARC_PATH"
@@ -48,13 +48,13 @@ echo "contents of condarc at $CONDARC_PATH"
 cat $CONDARC_PATH
 
 # install some required dependencies
-conda install conda-build anaconda-client conda-execute
+conda install conda-build=2.0 anaconda-client conda-execute
 
 # not sure why this is here, but I'm reasonably certain it is important
 export PYTHONUNBUFFERED=1
 
 # execute the dev build
-./repo/scripts/build.py /repo/recipes-config -u $UPLOAD_CHANNEL --python 2.7 3.4 3.5 --numpy 1.10 1.11 --token $BINSTAR_TOKEN --slack-channel $SLACK_CHANNEL --slack-token $SLACK_TOKEN
-./repo/scripts/build.py /repo/recipes-tag -u $UPLOAD_CHANNEL --python 2.7 3.4 3.5 --numpy 1.10 1.11 --token $BINSTAR_TOKEN --slack-channel $SLACK_CHANNEL --slack-token $SLACK_TOKEN --slack-channel $SLACK_CHANNEL
+./repo/scripts/build.py /repo/recipes-config -u $UPLOAD_CHANNEL --python 2.7 3.4 3.5 --numpy 1.10 1.11 --token $BINSTAR_TOKEN --slack-channel $SLACK_CHANNEL --slack-token $SLACK_TOKEN --allow-failures
+./repo/scripts/build.py /repo/recipes-tag -u $UPLOAD_CHANNEL --python 2.7 3.4 3.5 --numpy 1.10 1.11 --token $BINSTAR_TOKEN --slack-channel $SLACK_CHANNEL --slack-token $SLACK_TOKEN --slack-channel $SLACK_CHANNEL --allow-failures
 
 EOF
diff --git a/scripts/tail-tag-log b/scripts/tail-tag-log
@@ -1,4 +1,4 @@
 #!/bin/bash
-DIR="/home/edill/builds/`date +%Y`/`date +%m`/`date +%d`/"
+DIR="/home/lili/builds/`date +%Y`/`date +%m`/`date +%d`/"
 FILE="`ls -t -1 $DIR/*tag | head -n1`"
 tail -f $FILE