Merge branch '0.18.0' of github.com:uber/tchannel-python into json_he…

…aders

CHANGES.rst

@@ -4,11 +4,20 @@ Changes by Version
 0.18.0 (unreleased)
 -------------------
 
+- Added Thrift support to ``tcurl.py`` and re-worked the script's arguments.
+- Changed minimum required version of Tornado to 4.2.
 - **BREAKING** - headers for JSON handlers are not longer JSON blobs but are
   instead maps of strings to strings. This mirrors behavior for Thrift
   handlers.
 
 
+0.17.3 (unreleased)
+-------------------
+
+- Fixed uses of ``add_done_callback`` that should have been ``add_future``.
+  This was preventing propper request/response interleaving.
+
+
 0.17.2 (2015-09-18)
 -------------------
 

Makefile

@@ -19,16 +19,16 @@ env/bin/activate:
 	virtualenv env
 
 env_install: env/bin/activate
-	./env/bin/pip install -r requirements-test.txt --download-cache $(HOME)/.cache/pip
+	./env/bin/pip install -r requirements-test.txt
 	./env/bin/python setup.py develop
 
 .PHONY: tox_install
 tox_install:
-	pip install -r requirements-test.txt --download-cache $(HOME)/.cache/pip
+	pip install -r requirements-test.txt
 	python setup.py develop
 
 .PHONY: install
-install:
+install: clean
 ifdef TOX_ENV
 	make tox_install
 else
@@ -56,7 +56,7 @@ testhtml: clean
 clean:
 	rm -rf dist/
 	rm -rf build/
-	@find $(project) -name "*.pyc" -delete
+	@find $(project) tests -name "*.pyc" -delete
 
 .PHONY: lint
 lint:

requirements-test.txt

@@ -18,17 +18,11 @@ tox
 flake8==2.2.5
 
 # Optional dependency, but must be tested er'ry time
-toro>=0.8,<0.9
-tornado>=4.0,<5.0
 thrift==0.9.2
 
 # Smarter decorators
 wrapt>=1.10,<1.11
 
-# checksum calculation
-pyfarmhash==0.2.0
-crcmod
-
 # Mocks
 mock==1.0.1
 doubles

setup.py

@@ -14,13 +14,17 @@
         '': ['*.thrift'],
     },
     install_requires=[
+        # stdlib backports, no constraints needed
         'contextlib2',
-        'crcmod',
-        'tornado>=4.0,<5.0',
-        'toro>=0.8,<0.9',
-        'thriftrw>=0.3,<0.4',
-        'threadloop>=0.5,<0.6',
         'futures',
+
+        # external deps
+        'crcmod>=1,<2',
+        'tornado>=4.2,<5',
+
+        # tchannel deps
+        'thriftrw>=0.3,<0.4',
+        'threadloop>=1,<2',
     ],
     extras_require={
         'vcr': ['PyYAML', 'mock', 'wrapt'],
@@ -31,3 +35,4 @@
         ]
     },
 )
+