Merge branch 'release-1.1.1'

scott-maddox · Apr 25, 2015 · b8ca7ba · b8ca7ba
2 parents 517b92d + 2575298
commit b8ca7ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Changes in 1.1.1:
+
+- fixed `python setup.py install` (was broken by build in-place)
+
 Changes in 1.1:
 
 - removed the python fall-back module (simplify maintenance)

diff --git a/developers.txt b/developers.txt
@@ -22,14 +22,18 @@ version number):
 Now is a good time to install and test in a virtualenv, to make sure you
 haven't missed any bugs:
 
+    python setup.py sdist
+    tar -xvzf dist/fdint-1.0.tar.gz
+
     virtualenv venv
     source venv/bin/activate
+    cd fdint-1.0
     python setup.py install
-    cd ..
+    cd ../..
     python -m fdint.tests
     cd fdint
     deactivate
-    rm -rf venv
+    rm -rf fdint-1.0 venv
 
 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

diff --git a/fdint/version.py b/fdint/version.py
@@ -1 +1 @@
-__version__ = '1.1'
+__version__ = '1.1.1'
diff --git a/setup.cfg b/setup.cfg