Merge pull request #157 from Thriftpy/revert-139-master

Revert "Added Support For Apache JSON and Binary Data"
Thriftpy · Jan 21, 2021 · ac2b5e2 · ac2b5e2
2 parents 24b3341 + c63bbb2
commit ac2b5e2
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 823 deletions.
diff --git a/README.rst b/README.rst
@@ -168,10 +168,6 @@ python lib):
 
   * json protocol
 
-  * Apache JSON protocol compatible with apache thrift distribution's JSON protocol.
-    Simply do ``from thriftpy2.protocol import TApacheJSONProtocolFactory`` and pass
-    this to the ``proto_factory`` argument where appropriate.
-
   * buffered transport (python & cython)
 
   * framed transport

diff --git a/setup.py b/setup.py
@@ -15,7 +15,6 @@
 
 install_requires = [
     "ply>=3.4,<4.0",
-    "six~=1.15",
 ]
 
 tornado_requires = [
@@ -36,7 +35,6 @@
     "pytest>=2.8",
     "sphinx-rtd-theme>=0.1.9",
     "sphinx>=1.3",
-    "pytest>=6.1.1",
 ] + tornado_requires
 
 

diff --git a/tests/apache_json_test.thrift b/tests/apache_json_test.thrift
diff --git a/tests/test_all_protocols_binary_field.py b/tests/test_all_protocols_binary_field.py