git commit: THRIFT-2620: Fix python packaging Client: build process Patch: jfarrell

[jf...@apache.org]

Repository: thrift
Updated Branches:
  refs/heads/master 8fd8c6366 -> 750df2ec4


THRIFT-2620: Fix python packaging
Client: build process
Patch: jfarrell

Fixes python build to include missing README.md and also run packaging under
vagrant images


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/750df2ec
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/750df2ec
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/750df2ec

Branch: refs/heads/master
Commit: 750df2ec4c039e504673af2449fa2996138ef767
Parents: 8fd8c63
Author: jfarrell <jf...@apache.org>
Authored: Thu Jul 10 09:18:42 2014 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Thu Jul 10 09:18:42 2014 -0400

----------------------------------------------------------------------
 .gitignore       | 3 +--
 lib/py/setup.cfg | 2 ++
 lib/py/setup.py  | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/750df2ec/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 02316f3..f4a4b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.log
 *.trs
 *.suo
+*.pyc
 *.cache
 *.user
 *.ipch
@@ -210,8 +211,6 @@ test-driver
 /test/log/
 /test/test.log
 /test/py.twisted/_trial_temp/
-/test/py.twisted/test_suite.pyc
-/test/py.tornado/*.pyc
 /test/rb/Gemfile.lock
 /tutorial/cpp/TutorialClient
 /tutorial/cpp/TutorialServer

http://git-wip-us.apache.org/repos/asf/thrift/blob/750df2ec/lib/py/setup.cfg
----------------------------------------------------------------------
diff --git a/lib/py/setup.cfg b/lib/py/setup.cfg
index 2dca2f8..c6dab40 100644
--- a/lib/py/setup.cfg
+++ b/lib/py/setup.cfg
@@ -1,2 +1,4 @@
 [install]
 optimize = 1
+[metadata]
+description-file = README.md

http://git-wip-us.apache.org/repos/asf/thrift/blob/750df2ec/lib/py/setup.py
----------------------------------------------------------------------
diff --git a/lib/py/setup.py b/lib/py/setup.py
index 76a3526..bd177b3 100644
--- a/lib/py/setup.py
+++ b/lib/py/setup.py
@@ -28,6 +28,11 @@ except:
 from distutils.command.build_ext import build_ext
 from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError
 
+# Fix to build sdist under vagrant
+import os
+if 'vagrant' in str(os.environ):
+    del os.link
+
 include_dirs = []
 if sys.platform == 'win32':
     include_dirs.append('compat/win32')