Merge c2215af into dc300f3

uber · Aug 6, 2015 · 69e6c14 · 69e6c14
2 parents dc300f3 + c2215af
commit 69e6c14
Show file tree

Hide file tree

Showing 83 changed files with 2,458 additions and 971 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -10,7 +10,7 @@ exclude_lines =
 omit =
     tchannel/zipkin/thrift/*
     tchannel/testing/vcr/proxy/*
-    tests/data/generated/ThriftTest/*
+    tchannel/testing/data/*    
 
 [xml]
 output = coverage.xml
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@ node_modules/
 env/
 *.xml
 *.egg-info
-.coverage
+*.coverage*
 *.pyc
 .phutil_module_cache
 build/

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,10 +2,19 @@ Changelog
 =========
 
 
-0.14.1 (unreleased)
+0.15.0 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Introduced new top level ``tchannel.TChannel`` object, with new request methods
+  ``call``, ``raw``, ``json``, and ``thrift``. This will eventually replace the
+  akward ``request`` / ``send`` calling pattern.
+- Introduced ``tchannel.from_thrift_module`` function for creating a request builder
+  to be used with the ``tchannel.TChannel.thrift`` function.
+- Introduced new simplified examples under the ``examples/simple`` directory, moved
+  the Guide's examples to ``examples/guide``, and deleted the remaining examples.
+- Added ThriftTest.thrift and generated Thrift code to ``tchannel.testing.data`` for
+  use with examples and playing around with TChannel.
+- Fix JSON arg2 (headers) being returned a string instead of a dict.
 
 
 0.14.0 (2015-08-03)

diff --git a/UPGRADE.rst b/UPGRADE.rst
@@ -4,6 +4,22 @@ Version Upgrade Guide
 Migrating to a version of TChannel with breaking changes? This guide documents
 what broke and how to safely migrate to newer versions.
 
+From 0.14 to 0.15
+-----------------
+
+- No breaking changes.
+
+From 0.13 to 0.14
+-----------------
+
+- No breaking changes.
+
+From 0.12 to 0.13
+-----------------
+
+- No breaking changes.
+
+
 From 0.11 to 0.12
 -----------------
 

diff --git a/examples/keyvalue/keyvalue/__init__.py → examples/guide/keyvalue/keyvalue/__init__.py b/examples/keyvalue/keyvalue/__init__.py → examples/guide/keyvalue/keyvalue/__init__.py
diff --git a/examples/keyvalue/keyvalue/client.py → examples/guide/keyvalue/keyvalue/client.py b/examples/keyvalue/keyvalue/client.py → examples/guide/keyvalue/keyvalue/client.py
diff --git a/examples/keyvalue/keyvalue/server.py → examples/guide/keyvalue/keyvalue/server.py b/examples/keyvalue/keyvalue/server.py → examples/guide/keyvalue/keyvalue/server.py
diff --git a/...keyvalue/keyvalue/service/KeyValue-remote → ...keyvalue/keyvalue/service/KeyValue-remote b/...keyvalue/keyvalue/service/KeyValue-remote → ...keyvalue/keyvalue/service/KeyValue-remote
diff --git a/...les/keyvalue/keyvalue/service/KeyValue.py → ...ide/keyvalue/keyvalue/service/KeyValue.py b/...les/keyvalue/keyvalue/service/KeyValue.py → ...ide/keyvalue/keyvalue/service/KeyValue.py
diff --git a/...les/keyvalue/keyvalue/service/__init__.py → ...ide/keyvalue/keyvalue/service/__init__.py b/...les/keyvalue/keyvalue/service/__init__.py → ...ide/keyvalue/keyvalue/service/__init__.py
diff --git a/...es/keyvalue/keyvalue/service/constants.py → ...de/keyvalue/keyvalue/service/constants.py b/...es/keyvalue/keyvalue/service/constants.py → ...de/keyvalue/keyvalue/service/constants.py
diff --git a/examples/keyvalue/keyvalue/service/ttypes.py → ...guide/keyvalue/keyvalue/service/ttypes.py b/examples/keyvalue/keyvalue/service/ttypes.py → ...guide/keyvalue/keyvalue/service/ttypes.py
diff --git a/examples/keyvalue/setup.py → examples/guide/keyvalue/setup.py b/examples/keyvalue/setup.py → examples/guide/keyvalue/setup.py
diff --git a/examples/keyvalue/thrift/service.thrift → ...ples/guide/keyvalue/thrift/service.thrift b/examples/keyvalue/thrift/service.thrift → ...ples/guide/keyvalue/thrift/service.thrift
diff --git a/examples/handlers.py b/examples/handlers.py
diff --git a/examples/json_client.py b/examples/json_client.py
diff --git a/examples/json_server.py b/examples/json_server.py
diff --git a/examples/options.py b/examples/options.py
diff --git a/examples/raw_client.py b/examples/raw_client.py
diff --git a/examples/raw_server.py b/examples/raw_server.py