Merge pull request RIPE-NCC#132 from danielquinn/next-release

The latest release 1.2.0 is broken
danielquinn · Dec 15, 2015 · 0d214a3 · 0d214a3
2 parents 92b7c31 + a59a1d2
commit 0d214a3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,4 +3,6 @@ include README.rst
 include CHANGES.rst
 include MANIFEST.in
 recursive-include ripe *.py
+recursive-include ripe *.yaml
+recursive-include ripe *.txt
 recursive-include tests *.py
diff --git a/ripe/atlas/tools/version.py b/ripe/atlas/tools/version.py
@@ -13,4 +13,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
diff --git a/tests/commands/measure.py b/tests/commands/measure.py
@@ -20,7 +20,7 @@
 
 from random import randint
 
-# Python 3 comes with mock in unittest
+# Python 3.4+ comes with mock in unittest
 try:
     from unittest import mock
 except ImportError: