diff --git a/.gitignore b/.gitignore index de64b4c7..228ac64c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,12 +10,3 @@ crate.egg-info /.idea/ .tox/ *.DS_Store - -/devtools/bin/ -/devtools/dependencies/ -/devtools/eggs/ -/devtools/parts/ -/devtools/develop-eggs/ -/devtools/.installed.cfg -/devtools/crash-*.zip.py -/devtools/venv/ diff --git a/CHANGES.txt b/CHANGES.txt index 1147f1ea..da92f62a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,7 +2,12 @@ Changes for crate ================= -2014/04/21 0.8.0 +2014/04/04 0.8.1 +================ + + - client: fix error handling in ``client.server_infos()`` + +2014/03/21 0.8.0 ================ - updated crate to 0.32.3 diff --git a/create_tag.sh b/devtools/create_tag.sh similarity index 83% rename from create_tag.sh rename to devtools/create_tag.sh index fd730135..7a53cca1 100755 --- a/create_tag.sh +++ b/devtools/create_tag.sh @@ -31,28 +31,24 @@ fi echo "Fetching origin..." git fetch origin > /dev/null -# check if current branch is master +# get current branch BRANCH=`git branch | grep "^*" | cut -d " " -f 2` -if [ "$BRANCH" != "master" ] -then - echo "Current branch is $BRANCH. Must be master." - echo "Aborting." - exit -1 -fi +echo "Current branch is $BRANCH." # check if master == origin/master -MASTER_COMMIT=`git show --format="%H" master` -ORIGINMASTER_COMMIT=`git show --format="%H" origin/master` +LOCAL_COMMIT=`git show --format="%H" $BRANCH` +ORIGIN_COMMIT=`git show --format="%H" origin/$BRANCH` -if [ "$MASTER_COMMIT" != "$ORIGINMASTER_COMMIT" ] +if [ "$LOCAL_COMMIT" != "$ORIGIN_COMMIT" ] then - echo "Local master is not up to date. " + echo "Local $BRANCH is not up to date. " echo "Aborting." exit -1 fi # check if tag to create has already been created -VERSION=`./bin/py setup.py --version` +WORKING_DIR=`dirname $0` +VERSION=`$WORKING_DIR/../bin/py setup.py --version` EXISTS=`git tag | grep $VERSION` if [ "$VERSION" == "$EXISTS" ] diff --git a/src/crate/client/__init__.py b/src/crate/client/__init__.py index 17c40695..211519de 100644 --- a/src/crate/client/__init__.py +++ b/src/crate/client/__init__.py @@ -24,7 +24,7 @@ # version string read from setup.py using a regex. Take care not to break the # regex! -__version__ = "0.8.0" +__version__ = "0.8.1" apilevel = "2.0" threadsafety = 2