Add make docs

CHANGELOG.rst

@@ -1,34 +1,42 @@
+Changelog
+=========
+
+6.0.0 (2015-XX-XX)
+------------------
+- User-defined formats are no longer global. The registration mechanism has
+  changed and is now done via configuration. See `TODO <>`_
+
 5.0.0 (2015-08-27)
----------------------
+------------------
 - Update ResourceDecorator to return an operation as a CallableOperation
   instead of a function wrapper (for the docstring). This allows further
   decoration of the ResourceDecorator.
 
 4.0.0 (2015-08-10)
----------------------
+------------------
 - Consistent bravado.exception.HTTPError now thrown from both Fido and Requests http clients.
 - HTTPError refactored to contain an optional detailed message and Swagger response result.
 
 3.0.0 (2015-08-03)
----------------------
+------------------
 - Support passing in connect_timeout and timeout via _request_options to the Fido and Requests clients
 - Timeout in HTTPFuture now defaults to None (wait indefinitely) instead of 5s. You should make sure
   any calls to http_future.result(..) without a timeout are updated accordingly.
 
 2.1.0 (2015-07-20)
----------------------
+------------------
 - Add warning for deprecated operations
 
 2.0.0 (2015-07-13)
----------------------
+------------------
 - Assume responsibility for http invocation (used to be in bravado-core)
 
 1.1.0 (2015-07-06)
----------------------
+------------------
 - Made bravado compatible with Py34
 
 1.0.0 (2015-06-26)
-----------------------
+------------------
 - Fixed petstore demo link
 - Pick up bug fixes from bravado-core 1.1.0
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all install test tests clean
+.PHONY: all install test tests clean docs
 
 all: test
 
@@ -8,6 +8,9 @@ build:
 dev: clean
 	./setup.py develop
 
+docs:
+	tox -e docs
+
 install:
 	pip install .
 

setup.py

@@ -30,7 +30,7 @@
         "Programming Language :: Python :: 3.4",
     ],
     install_requires=[
-        "bravado-core >= 2.3.0",
+        "bravado-core >= 3.0.2",
         "crochet >= 1.4.0",
         "fido >= 2.1.0",
         "python-dateutil",

tests/fido_client/FidoClient/request_test.py

@@ -1,4 +1,5 @@
-from mock import patch, call, Mock
+import mock
+from mock import patch, Mock
 import pytest
 import six
 
@@ -15,7 +16,7 @@ def test_no_timeouts_passed_to_fido():
         fido_client = FidoClient()
         request_params = dict(url='http://foo.com/')
         fido_client.request(request_params, response_callback=None)
-        assert fetch.call_args == call(
+        assert fetch.call_args == mock.call(
             'http://foo.com/?', body='', headers={}, method='GET')
 
 
@@ -25,7 +26,7 @@ def test_timeout_passed_to_fido():
         fido_client = FidoClient()
         request_params = dict(url='http://foo.com/', timeout=1)
         fido_client.request(request_params, response_callback=None)
-        assert fetch.call_args == call(
+        assert fetch.call_args == mock.call(
             'http://foo.com/?', body='', headers={}, method='GET', timeout=1)
 
 
@@ -35,7 +36,7 @@ def test_connect_timeout_passed_to_fido():
         fido_client = FidoClient()
         request_params = dict(url='http://foo.com/', connect_timeout=1)
         fido_client.request(request_params, response_callback=None)
-        assert fetch.call_args == call(
+        assert fetch.call_args == mock.call(
             'http://foo.com/?', body='', headers={}, method='GET',
             connect_timeout=1)
 
@@ -47,6 +48,6 @@ def test_connect_timeout_and_timeout_passed_to_fido():
         request_params = dict(url='http://foo.com/', connect_timeout=1,
                               timeout=2)
         fido_client.request(request_params, response_callback=None)
-        assert fetch.call_args == call(
+        assert fetch.call_args == mock.call(
             'http://foo.com/?', body='', headers={}, method='GET',
             connect_timeout=1, timeout=2)