Merge branch 'master' into fc_unary

9 years ago · 266494cadb
parent cdc253535b b50eea8669
commit 266494cadb
2 changed files with 1 additions and 4 deletions
--- a/examples/php/composer.json
+++ b/examples/php/composer.json
@ -2,6 +2,6 @@
  "name": "grpc/grpc-demo",
  "description": "gRPC example for PHP",
  "require": {
-    "grpc/grpc": "v1.0.0",
+    "grpc/grpc": "v1.0.0"
  }
 }
--- a/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py
+++ b/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py
@ -114,9 +114,6 @@ class TypeSmokeTest(unittest.TestCase):
        lambda ignored_a, ignored_b: None, b'')
    del plugin

-  @unittest.skipIf(
-    platform.python_implementation() == "PyPy",
-    'TODO(issue 7672): figure out why this fails on PyPy')
  def testCallCredentialsFromPluginUpDown(self):
    plugin = cygrpc.CredentialsMetadataPlugin(_metadata_plugin_callback, b'')
    call_credentials = cygrpc.call_credentials_metadata_plugin(plugin)