From 337729e21160e0a39399804c3eb756a084146f59 Mon Sep 17 00:00:00 2001 From: Sean Cribbs Date: Fri, 19 Apr 2013 16:52:55 -0500 Subject: [PATCH 1/2] Remove need to have protoc available in Python source package. Closes #36. --- MANIFEST.in | 2 -- Makefile | 2 ++ setup.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index d4acfceb..e69de29b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +0,0 @@ -include proto_cmd.py -include src/*.proto \ No newline at end of file diff --git a/Makefile b/Makefile index 152cd7a0..6c0a9086 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,12 @@ erl_test: erl_compile # Python specific build steps python_compile: @echo "==> Python (compile)" + @protoc -Isrc --python_out=riak_pb src/*.proto @./setup.py build python_clean: @echo "==> Python (clean)" + @rm -f riak_pb/*_pb2.py @./setup.py clean python_release: python_compile diff --git a/setup.py b/setup.py index cf9be168..5c935f5a 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,5 @@ classifiers=['License :: OSI Approved :: Apache Software License', 'Intended Audience :: Developers', 'Operating System :: OS Independent', - 'Topic :: Database'], - cmdclass={'build_proto': build_proto, - 'clean': clean_proto} + 'Topic :: Database'] ) From 8642de78b2aaaed5ab058d5b5a1dc4594c6f92bb Mon Sep 17 00:00:00 2001 From: Sean Cribbs Date: Wed, 1 May 2013 14:29:30 -0500 Subject: [PATCH 2/2] Don't import proto_cmd since it is no longer used. --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 5c935f5a..0496d033 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ #!/usr/bin/env python from setuptools import setup -from proto_cmd import build_proto, clean_proto setup(name='riak_pb', version='1.2.1',