Replace nosetests with pytest and update httpretty

Author: rkoopmans

setup.py

@@ -11,7 +11,7 @@
 from version import __version__
 
 install_require = ['requests >= 2.7.0, < 3.0.0']
-tests_require = ['nose >= 1.3, < 2.0', 'httpretty >= 0.8.10, < 1.0.0']
+tests_require = ['pytest', 'httpretty < 1.1.5']
 
 if sys.version_info < (2, 7):
     tests_require.append('unittest2')

test/helper.py

@@ -5,7 +5,6 @@
 import sys
 import os
 import httpretty
-from nose.exc import SkipTest
 
 if sys.version_info < (3, 3):
     from mock import DEFAULT

test/tinify_client_test.py

@@ -7,6 +7,7 @@
 import tinify
 from tinify import Client, AccountError, ClientError, ConnectionError, ServerError
 import requests
+import pytest
 
 from helper import *
 
@@ -75,10 +76,9 @@ def setUp(self):
           'compression-count': 12
         })
 
+    @pytest.mark.skip(reason="https://github.com/gabrielfalcao/HTTPretty/issues/122")
     def test_should_issue_request_with_proxy_authorization(self):
-        raise SkipTest('https://github.com/gabrielfalcao/HTTPretty/issues/122')
         Client('key', None, 'http://user:pass@localhost:8080').request('GET', '/')
-
         self.assertEqual(self.request.headers['proxy-authorization'], 'Basic dXNlcjpwYXNz')
 
 class TinifyClientRequestWithTimeoutRepeatedly(TestHelper):

test/tinify_test.py

@@ -4,6 +4,7 @@
 from base64 import b64encode
 
 import tinify
+import pytest
 from helper import *
 
 class TinifyKey(TestHelper):
@@ -27,13 +28,14 @@ def test_should_reset_client_with_new_app_identifier(self):
         self.assertEqual(self.request.headers['user-agent'], tinify.Client.USER_AGENT + " MyApp/2.0")
 
 class TinifyProxy(TestHelper):
+
+    @pytest.mark.skip(reason="https://github.com/gabrielfalcao/HTTPretty/issues/122")
     def test_should_reset_client_with_new_proxy(self):
         httpretty.register_uri(httpretty.CONNECT, 'http://localhost:8080')
         tinify.key = 'abcde'
         tinify.proxy = 'http://localhost:8080'
         tinify.get_client()
         tinify.proxy = 'http://localhost:8080'
-        raise SkipTest('https://github.com/gabrielfalcao/HTTPretty/issues/122')
         tinify.get_client().request('GET', '/')
         self.assertEqual(self.request.headers['user-agent'], tinify.Client.USER_AGENT + " MyApp/2.0")