Protobuf 3.2.0

.travis.yml

@@ -6,7 +6,7 @@ sudo: false
 cache:
   directories:
     - $HOME/.cache/pip
-    - /tmp/proto3.1.0
+    - /tmp/proto3.2.0
 
 install:
   - pip install pip --upgrade
@@ -21,8 +21,8 @@ before_script:
   - pip install -r dev-requirements.txt -c constraints.txt
 
 before_install:
-  - bash tools/travis-install-protoc.sh 3.1.0
-  - export PATH=/tmp/proto3.1.0/bin:$PATH
+  - bash tools/travis-install-protoc.sh 3.2.0
+  - export PATH=/tmp/proto3.2.0/bin:$PATH
 
 # run_tests.py runs everything under the script: tag so only put commands
 # under it that we want to run (and want to be able to run) as local tests

constraints.txt

@@ -24,4 +24,4 @@
 # ga4gh-schemas==0.1.0
 #
 #git+git://github.com/ga4gh/ga4gh-common.git@master#egg=ga4gh_common
-#git+git://github.com/ga4gh/schemas.git@master#egg=ga4gh_schemas
+git+git://github.com/ljdursi/ga4gh-schemas.git@protobuf_3.2.0#egg=ga4gh_schemas

requirements.txt

@@ -4,6 +4,6 @@
 # These requirements are read directly into setup.py, so specify them
 # in the order that they should be in in setup.py
 ga4gh_common==0.0.7
-ga4gh_schemas==0.6.0a10.post1
+ga4gh_schemas
 requests
-protobuf==3.1.0.post1
+protobuf==3.2.0

tests/unit/fakeobj.proto

@@ -0,0 +1,6 @@
+package fakeobj;
+
+message FakeObject {
+    required string name = 1;
+    required string id = 2;
+}

tests/unit/test_cli.py

@@ -9,13 +9,11 @@
 import mock
 import unittest
 
-import google.protobuf.descriptor as descriptor
-import google.protobuf.internal.python_message as python_message
-
 import ga4gh.client.cli as cli_client
 
 import ga4gh.common.utils as utils
-import ga4gh.schemas.protocol as protocol
+
+import tests.unit.fakeobj_pb2 as fakeobj
 
 
 class TestClientArguments(unittest.TestCase):
@@ -427,51 +425,8 @@ def __init__(self, outputFormat='text'):
             self.baseUrl = 'baseUrl'
             self.verbose = 'verbose'
 
-    class FakeObject(protocol.message.Message):
-        __metaclass__ = python_message.GeneratedProtocolMessageType
-
-        FILE = descriptor.FileDescriptor(__file__, "test", "")
-        DESCRIPTOR = descriptor.Descriptor(
-            "FakeObject",
-            "test.FakeObject",
-            filename=__file__,
-            file=FILE,
-            containing_type=None,
-            fields=[
-                descriptor.FieldDescriptor(
-                    name="name",
-                    full_name="test.FakeObject.name",
-                    index=0,
-                    number=1,
-                    type=descriptor.FieldDescriptor.TYPE_STRING,
-                    cpp_type=descriptor.FieldDescriptor.CPPTYPE_STRING,
-                    label=descriptor.FieldDescriptor.LABEL_REQUIRED,
-                    default_value="",
-                    message_type=None,
-                    enum_type=None,
-                    containing_type=None,
-                    is_extension=False,
-                    extension_scope=None
-                ),
-                descriptor.FieldDescriptor(
-                    name="id",
-                    full_name="test.FakeObject.id",
-                    index=1,
-                    number=2,
-                    type=descriptor.FieldDescriptor.TYPE_STRING,
-                    cpp_type=descriptor.FieldDescriptor.CPPTYPE_STRING,
-                    label=descriptor.FieldDescriptor.LABEL_REQUIRED,
-                    default_value="",
-                    message_type=None,
-                    enum_type=None,
-                    containing_type=None,
-                    is_extension=False,
-                    extension_scope=None
-                )
-            ], nested_types=[], enum_types=[], extensions=[])
-
     def makeFakeObject(self):
-        returnObj = self.FakeObject()
+        returnObj = fakeobj.FakeObject()
         returnObj.id = 'id'
         returnObj.name = 'name'
         return returnObj

tests/unit/test_client.py

@@ -132,7 +132,7 @@ def testSearchVariantAnnotations(self):
                 reference_name=self.referenceName,
                 start=self.start,
                 end=self.end,
-                effects=[{"term": "just a term"}, {"term_id": "an id"}],
+                effects=[{b"term": b"just a term"}, {b"term_id": b"an id"}],
                 reference_id=self.referenceId)
 
     def testSearchFeatures(self):