Make it work with grpc and gax

MartinSahlen · MartinSahlen · commit 6f9f0d21a03f · 2017-05-26T14:33:05.000-04:00
diff --git a/Manifest.in b/Manifest.in
@@ -0,0 +1,4 @@
+include README.md
+include cloudfn/docker/*
+include cloudfn/hooks/*
+include cloudfn/template/*
diff --git a/cloudfn/cli.py b/cloudfn/cli.py
@@ -18,7 +18,7 @@
 
 
 def repo_root():
-    return os.path.dirname(__file__) + '/../'
+    return os.path.dirname(__file__) + '/'
 
 
 def hooks_path():
@@ -52,6 +52,8 @@ def build_for_production(file_name='main.py'):
 
 
 def build_for_local(file_name='main.py'):
+    print hooks_path()
+    print repo_root()
     base = [
         'pyinstaller ', file_name, '-y', '-n', output_name(),
         '--clean', '--onedir',
diff --git a/cloudfn/docker/Dockerfile b/cloudfn/docker/Dockerfile
diff --git a/cloudfn/hooks/hook-google.cloud.bigquery.py b/cloudfn/hooks/hook-google.cloud.bigquery.py
@@ -0,0 +1,3 @@
+from PyInstaller.utils.hooks import copy_metadata
+
+datas = copy_metadata('grpcio')
diff --git a/cloudfn/hooks/hook-google.cloud.bigtable.py b/cloudfn/hooks/hook-google.cloud.bigtable.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-bigtable')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.core.py b/cloudfn/hooks/hook-google.cloud.core.py
diff --git a/cloudfn/hooks/hook-google.cloud.datastore.py b/cloudfn/hooks/hook-google.cloud.datastore.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-datastore')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.dns.py b/cloudfn/hooks/hook-google.cloud.dns.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-dns')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.error_reporting.py b/cloudfn/hooks/hook-google.cloud.error_reporting.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-error-reporting')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.language.py b/cloudfn/hooks/hook-google.cloud.language.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-language')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.logging.py b/cloudfn/hooks/hook-google.cloud.logging.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-logging')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.monitoring.py b/cloudfn/hooks/hook-google.cloud.monitoring.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-monitoring')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.pubsub.py b/cloudfn/hooks/hook-google.cloud.pubsub.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-pubsub')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.resource_manager.py b/cloudfn/hooks/hook-google.cloud.resource_manager.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-resource-manager')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.runtimeconfig.py b/cloudfn/hooks/hook-google.cloud.runtimeconfig.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-runtimeconfig')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.spanner.py b/cloudfn/hooks/hook-google.cloud.spanner.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-spanner')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.speech.py b/cloudfn/hooks/hook-google.cloud.speech.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-speech')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.storage.py b/cloudfn/hooks/hook-google.cloud.storage.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-storage')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.translate.py b/cloudfn/hooks/hook-google.cloud.translate.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-translate')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.cloud.vision.py b/cloudfn/hooks/hook-google.cloud.vision.py
@@ -1,3 +1,4 @@
 from PyInstaller.utils.hooks import copy_metadata
 
 datas = copy_metadata('google-cloud-vision')
+datas += copy_metadata('google-cloud-core')
diff --git a/cloudfn/hooks/hook-google.gax.py b/cloudfn/hooks/hook-google.gax.py
@@ -0,0 +1,3 @@
+from PyInstaller.utils.hooks import copy_metadata
+
+datas = copy_metadata('google-gax')
diff --git a/cloudfn/hooks/hook-grpc.py b/cloudfn/hooks/hook-grpc.py
@@ -0,0 +1,3 @@
+from PyInstaller.utils.hooks import copy_metadata
+
+datas = copy_metadata('grpcio')
diff --git a/cloudfn/template/index.js b/cloudfn/template/index.js
diff --git a/hooks/hook-google.cloud.bigquery.py b/hooks/hook-google.cloud.bigquery.py
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='pycloudfn',
-    version='0.1.13',
+    version='0.1.24',
     description='GCP Cloud functions in python',
     url='https://github.com/MartinSahlen/cloud-functions-python',
     author='Martin Sahlen',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from PyInstaller.utils.hooks import copy_metadata`
	`2`	`+`
	`3`	`+datas = copy_metadata('grpcio')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-bigtable')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-datastore')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-dns')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-error-reporting')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-language')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-logging')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-monitoring')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-pubsub')`
	`4`	`+datas += copy_metadata('google-cloud-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`from PyInstaller.utils.hooks import copy_metadata`
`2`	`2`
`3`	`3`	`datas = copy_metadata('google-cloud-resource-manager')`
	`4`	`+datas += copy_metadata('google-cloud-core')`