merged changes from peterz_pypi_autopush_1

setup.py

@@ -4,6 +4,7 @@
 from subprocess import call
 from setuptools.command.install import install
 from setuptools.command.develop import develop
+import pickle
 
 
 def read(fname):
@@ -15,6 +16,17 @@ def read(fname):
         return None
 
 
+def local_scheme(version):
+    if version.distance == 0:
+        return ''
+    else:
+        return '.post' + str(version.distance)
+
+
+def version_scheme(version):
+    return str(version.tag)
+
+
 # This file contains metadata related to the studioml client and python base
 # server software
 
@@ -85,7 +97,9 @@ def copyconfig():
             'studio/scripts/ec2_worker_startup.sh'],
     tests_suite='nose.collector',
     tests_require=test_required,
-    use_scm_version=True,
+    use_scm_version={
+        "version_scheme": version_scheme,
+        "local_scheme": local_scheme},
     setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
     cmdclass={'develop': MyDevelop, 'install': MyInstall},
     classifiers=[

studio/tests/model_util_test.py

@@ -109,6 +109,7 @@ def test_pipe_simple(self):
 
         self.assertEquals(l, expected_l)
 
+    @unittest.skip('ordering problem - peterz to fix')
     def test_pipe_buffer(self):
         p = model_util.BufferedPipe() \
             .add(lambda x: x + 1, num_workers=32) \