Merge branch 'release-0.1.2'

CHANGELOG.txt

@@ -1,3 +1,7 @@
+Changes in 0.1.2:
+
+- fixed an egregious copy-paste error in the README
+
 Changes in 0.1.1:
 
 - updated and improved README

README.rst

@@ -36,7 +36,7 @@ package index, which contains many python packages that can be easily installed
 with a single command. To install OBPDS from `PyPi`_, open up a command
 prompt and run the following command::
 
-    pip install fdint
+    pip install obpds
 
 .. _`PyPi`: http://pypi.python.org/pypi
 

developers.txt

@@ -17,39 +17,39 @@ When you want release a new version, follow these directions. First, create a
 release branch by branching off of the develop branch (substitute in the
 appropriate version number):
 
-    git checkout -b release-0.1.1 develop
+    git checkout -b release-0.1.2 develop
 
 Next, bump the version number, if it hasn't already been bumped. From the root
 of the git repository run these commands (again, substituting the appropriate
 version number):
 
-    echo "__version__ = '0.1.1'" > src/obpds/version.py
-    git commit -am "bump version number to 0.1.1"
+    echo "__version__ = '0.1.2'" > src/obpds/version.py
+    git commit -am "bump version number to 0.1.2"
 
 Now is a good time to install and test in a virtualenv, which can
 help find problems with installation and dependencies:
 
     python setup.py sdist
     cd dist
-    tar -xvzf obpds-0.1.1.tar.gz
+    tar -xvzf obpds-0.1.2.tar.gz
 
     virtualenv venv
     source venv/bin/activate
-    cd obpds-0.1.1
+    cd obpds-0.1.2
     pip install numpy matplotlib scipy
     python setup.py install
     cd ..
     python -m obpds.tests
     deactivate
-    rm -rf venv obpds-0.1.1
+    rm -rf venv obpds-0.1.2
 
 Go ahead and fix any bugs you find in the release branch, and we'll merge them
 back into the develop branch later.  Next, merge the changes from the release
 branch into the master branch, and tag the release:
 
     git checkout master
-    git merge --no-ff release-0.1.1
-    git tag -a v0.1.1
+    git merge --no-ff release-0.1.2
+    git tag -a v0.1.2
     git push origin master
 
 Then run the following commands from the root of the git repository to build
@@ -66,5 +66,5 @@ Now you can merge the release branch back into the develop branch, and then
 delete the release branch:
 
     git checkout develop
-    git merge --no-ff release-0.1.1
-    git branch -d release-0.1.1
+    git merge --no-ff release-0.1.2
+    git branch -d release-0.1.2

src/obpds/version.py

@@ -1 +1 @@
-__version__ = '0.1.1'
+__version__ = '0.1.2'