Merge pull request #7 from bzz/fix-python-packaging

Fix python packaging

Author: bzz

.gitignore

@@ -7,5 +7,5 @@ __pycache__
 
 .ci
 
-build
-dist
+python/build
+python/dist

.travis.yml

@@ -25,9 +25,8 @@ jobs:
       stage: test
       language: python
       python: "3.6"
-      if: branch = fix-python-packaging
       install:
-        - pip3 install -e .
+        - pip3 install -e python
         - ./_tools/install-lookout-latest.sh
       script:
         - (python3 language-analyzer.py |& tee -a ../py-analyzer.log)&
@@ -66,6 +65,7 @@ jobs:
       python: "3.6"
       before_script:
         - pip3 install twine
+        - cd python
       script:
         - python3 setup.py bdist_wheel
         - twine upload dist/*py3-none-any* -u $PYPI_LOGIN -p $PYPI_PASS

_tools/protogen_golang.sh

@@ -1,17 +1,40 @@
 #!/bin/bash
 #
 # Generates Protobuf + gRCP for Golang
-# Assumes protoc and protoc-gen-gogofaster binaries are installed
+# Assumes 'protoc' and 'protoc-gen-gogofaster' binaries are installed
 
 PROTOC="../protoc/bin/protoc"
+sdk="lookout/sdk"
+src="proto"
+dst="golang"
+
 
 [[ -f "../protoc/bin/protoc" ]] >/dev/null 2>&1 || { echo "Protobuf compiler is required but not found in ${PROTOC}" >&2; exit 1; }
 
+if ! mkdir -p "${dst}" ; then
+    echo "Failed to create ${dst}"
+    exit 2
+fi
+
 "${PROTOC}" -I proto \
     --gogofaster_out=plugins=grpc,\
 Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,\
 Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,\
 Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\
 Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types,\
-Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types:pb \
-proto/*.proto
+Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types:"${dst}" \
+"${src}/${sdk}/"*.proto
+if [[ "$?" -ne 0 ]]; then
+    echo "Failed to run protoc on ${src}/${sdk}"
+    exit 2
+fi
+
+if ! mv "${dst}/${sdk}/"*.go pb ; then
+    echo "Failed to mv ${dst}/${sdk}/*.go to ./pb"
+    exit 2
+fi
+
+if ! rm -rf "${dst}" ; then
+    echo "Failed to delete ${dst}"
+    exit 2
+fi

_tools/protogen_python.sh

@@ -1,20 +1,29 @@
 #!/bin/bash -e
 #
 # Generates Protobuf + gRCP for Python
-# Assumes grpcio_tools package is installed (it includes binary of protoc+grpc plugin)
+# Assumes 'grpcio_tools' package is installed (it includes binary of protoc+grpc plugin)
 
 
 src_dir="proto"
-out_dir="lookout_sdk"
+out_dir="python"
 
 mkdir -p "${out_dir}"
 
 python3 -m grpc_tools.protoc -I "${src_dir}" \
     --python_out="${out_dir}" --grpc_python_out="${out_dir}" \
-    "${src_dir}"/*.proto
+    $(find "${src_dir}/lookout" -iname "*.proto")
 
-# because of https://github.com/bblfsh/client-python/blob/bc807c772079f0fb78fe35709fb7b99283f8b539/setup.py#L179
-# this also makes depending on "bblfsh" at runtime mandatory :/
+# because these package exist in bblfsh, and are going to be used at runtime
+# https://github.com/bblfsh/client-python/blob/bc807c772079f0fb78fe35709fb7b99283f8b539/setup.py#L179
+# this also makes "bblfsh" a mandatory runtime dependency
 find "${out_dir}" -name '*.py' -exec sed -i 's/^from github/from bblfsh.github/g' {} \;
 find "${out_dir}" -name '*.py' -exec sed -i "s/import_module('gopkg.in/import_module('bblfsh.gopkg.in/g" {} \;
-touch "${out_dir}"/__init__.py
+
+# make a python packages
+<< END >> "${out_dir}/lookout/__init__.py"
+# DO NOT CHANGE OR ADD ANYTHING HERE
+import pkg_resources
+pkg_resources.declare_namespace(__name__)
+__version__ = 0, 0, 1
+END
+touch "${out_dir}/lookout/sdk/__init__.py"

language-analyzer.py

@@ -8,10 +8,10 @@
 import time
 import grpc
 
-from lookout_sdk import service_analyzer_pb2_grpc
-from lookout_sdk import service_analyzer_pb2
-from lookout_sdk import service_data_pb2_grpc
-from lookout_sdk import service_data_pb2
+from lookout.sdk import service_analyzer_pb2_grpc
+from lookout.sdk import service_analyzer_pb2
+from lookout.sdk import service_data_pb2_grpc
+from lookout.sdk import service_data_pb2
 
 from bblfsh import filter as filter_uast