From 58537cfcf6dc9b8bbca5a518c49136361cd4d0a8 Mon Sep 17 00:00:00 2001 From: John Harrison Date: Mon, 24 Apr 2017 21:57:30 +0100 Subject: [PATCH] Fix support for Python 3.4 (#2) Fix support for 3.4 * Fix relative import for Python 3 * Make Travis CI run Tox tests * Run coverage tests with tox in py26 and py34 --- .travis.yml | 8 ++++--- tox.ini | 6 ++++-- wiremock/base/__init__.py | 4 ++-- wiremock/client.py | 21 +++++++++---------- wiremock/exceptions/__init__.py | 20 +++++++++--------- .../exceptions/api_unavailable_exception.py | 2 +- wiremock/exceptions/client_exception.py | 2 +- wiremock/exceptions/forbidden_exception.py | 2 +- .../exceptions/invalid_input_exception.py | 2 +- wiremock/exceptions/not_found_exception.py | 2 +- .../exceptions/requires_login_exception.py | 2 +- wiremock/exceptions/server_exception.py | 2 +- wiremock/exceptions/timeout_exception.py | 2 +- .../unexpected_response_exception.py | 2 +- wiremock/resources/mappings/__init__.py | 2 +- wiremock/resources/near_misses/__init__.py | 2 +- wiremock/resources/requests/__init__.py | 2 +- wiremock/resources/settings/__init__.py | 2 +- 18 files changed, 44 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index a29f0ea..caa826d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,11 @@ language: python python: - '2.7' -install: pip install -r requirements.pip -script: bash ./run_coverage.sh +- '3.4' +install: +- pip install -r requirements.pip +- pip install tox-travis +script: tox deploy: provider: pypi on: @@ -15,4 +18,3 @@ deploy: secure: JhLffSYa/ES20jPiXmmEwEq6jLwpd2VEDe3KT+iqZ6LPygxCFjyoT8rI7LBz91PsjjBZa1jVFw7kAdtT6RvLOFHp3Pol87ULpmM8PBD++FIShxPFds2p+5UzEvQ/D3+6E9gxeHIwNQk6RGwYm4hF7kGaWQwhtD+Y3mXhL4pjvtGy+3rkXWHhe0LNvRdCUqogsv7EXBhRZunb/KqLW7rtn7NlTnBVz+Sf97GPuNtgmMG2UPnCcsip0V+hUgMcpMXqlVbPpFNfq2k901qKfRMgg4hjum6ML+oKCqiXFzH/cTCj9okNzK56yAkSN3lrfUPKHIVAfLAYDXexFCTDpbr970XnTtpFBlqzBnB8W4dYXrBb00j3vWy3yJrXZSQSwn8ETUBC4ObSKFJseIA0OFMlUoBHkVyLo0iH30VGGAlI0p3FXY+DBSQxIvyCIlbHbmHEcPlKyb6K5sEZgAT6mqPiPi0d6MnDNXF4R5+LAI0uZhr0EzXZkKoP0wH1DUoR72NJIyfGPKEvmY/os86UcvI9fGKCaqC15I2gMoKBWJ2s7xjiDvZ5Hi1vhK/kP2rQnGDrUd2wclhufMARiW0KYhJsfgMj4Q5ICQ4bMP3SWuXRc9A6toMLnH82z0r2sPLv8OFidbPW9wq4tnfZ0+WtJ2p+FARauEStHeVXdpfwkZds25I= after_success: - coveralls - diff --git a/tox.ini b/tox.ini index f9392ff..b39f0e3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,9 @@ [tox] -envlist = py27, py34 +envlist = py{27,34} [testenv] +whitelist_externals = + rm deps = nose coverage @@ -12,5 +14,5 @@ deps = commands = {envpython} setup.py -q install - nosetests -vv --attr=unit + nosetests -vv --attr=unit --with-coverage --cover-erase --cover-package=wiremock --cover-html --cover-xml --cover-min-percentage=85 --cover-html-dir={toxinidir}/coverage/ --cover-xml-file={toxinidir}/coverage/coverage.xml rm -Rf build || true diff --git a/wiremock/base/__init__.py b/wiremock/base/__init__.py index 1173e97..b4ccb6a 100644 --- a/wiremock/base/__init__.py +++ b/wiremock/base/__init__.py @@ -1,2 +1,2 @@ -from base_entity import * -from base_resource import BaseResource, RestClient +from .base_entity import * +from .base_resource import BaseResource, RestClient diff --git a/wiremock/client.py b/wiremock/client.py index a64f729..ebb0eb2 100644 --- a/wiremock/client.py +++ b/wiremock/client.py @@ -1,20 +1,19 @@ - # import Exceptions -from exceptions import * +from .exceptions import * # import Models -from resources.settings import GlobalSetting -from resources.mappings import Mapping, MappingResponse, MappingRequest, DelayDistribution,\ +from .resources.settings import GlobalSetting +from .resources.mappings import Mapping, MappingResponse, MappingRequest, DelayDistribution,\ ResponseFaultType, DelayDistributionMethods, BasicAuthCredentials, WireMockMatchers, HttpMethods, \ CommonHeaders, MappingMeta, AllMappings -from resources.requests import RequestResponse, RequestResponseDefinition, RequestResponseRequest, \ +from .resources.requests import RequestResponse, RequestResponseDefinition, RequestResponseRequest, \ RequestCountResponse, RequestResponseAll, RequestResponseFindResponse, RequestResponseAllMeta -from resources.near_misses import NearMissMatchResponse, NearMissMatchRequest, NearMissMatchResult, \ +from .resources.near_misses import NearMissMatchResponse, NearMissMatchRequest, NearMissMatchResult, \ NearMissRequestPatternResult, NearMissMatch, NearMissMatchPatternRequest # import Resources -from resources.settings.resource import GlobalSettings -from resources.mappings.resource import Mappings -from resources.requests.resource import Requests -from resources.near_misses.resource import NearMisses -from resources.scenarios.resource import Scenarios +from .resources.settings.resource import GlobalSettings +from .resources.mappings.resource import Mappings +from .resources.requests.resource import Requests +from .resources.near_misses.resource import NearMisses +from .resources.scenarios.resource import Scenarios diff --git a/wiremock/exceptions/__init__.py b/wiremock/exceptions/__init__.py index 1ebf466..00d06aa 100644 --- a/wiremock/exceptions/__init__.py +++ b/wiremock/exceptions/__init__.py @@ -1,10 +1,10 @@ -from api_exception import ApiException -from api_unavailable_exception import ApiUnavailableException -from client_exception import ClientException -from forbidden_exception import ForbiddenException -from invalid_input_exception import InvalidInputException -from not_found_exception import NotFoundException -from requires_login_exception import RequiresLoginException -from server_exception import ServerException -from timeout_exception import TimeoutException -from unexpected_response_exception import UnexpectedResponseException +from .api_exception import ApiException +from .api_unavailable_exception import ApiUnavailableException +from .client_exception import ClientException +from .forbidden_exception import ForbiddenException +from .invalid_input_exception import InvalidInputException +from .not_found_exception import NotFoundException +from .requires_login_exception import RequiresLoginException +from .server_exception import ServerException +from .timeout_exception import TimeoutException +from .unexpected_response_exception import UnexpectedResponseException diff --git a/wiremock/exceptions/api_unavailable_exception.py b/wiremock/exceptions/api_unavailable_exception.py index b0e31f5..97f7367 100644 --- a/wiremock/exceptions/api_unavailable_exception.py +++ b/wiremock/exceptions/api_unavailable_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class ApiUnavailableException(ApiException): diff --git a/wiremock/exceptions/client_exception.py b/wiremock/exceptions/client_exception.py index 1ecb52c..1816ce0 100644 --- a/wiremock/exceptions/client_exception.py +++ b/wiremock/exceptions/client_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class ClientException(ApiException): diff --git a/wiremock/exceptions/forbidden_exception.py b/wiremock/exceptions/forbidden_exception.py index 32d12f1..b122371 100644 --- a/wiremock/exceptions/forbidden_exception.py +++ b/wiremock/exceptions/forbidden_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class ForbiddenException(ApiException): diff --git a/wiremock/exceptions/invalid_input_exception.py b/wiremock/exceptions/invalid_input_exception.py index 364bf73..a65c1ed 100644 --- a/wiremock/exceptions/invalid_input_exception.py +++ b/wiremock/exceptions/invalid_input_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class InvalidInputException(ApiException): diff --git a/wiremock/exceptions/not_found_exception.py b/wiremock/exceptions/not_found_exception.py index 5b481f3..bf8e4fa 100644 --- a/wiremock/exceptions/not_found_exception.py +++ b/wiremock/exceptions/not_found_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class NotFoundException(ApiException): diff --git a/wiremock/exceptions/requires_login_exception.py b/wiremock/exceptions/requires_login_exception.py index 59bec6a..2cb515c 100644 --- a/wiremock/exceptions/requires_login_exception.py +++ b/wiremock/exceptions/requires_login_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class RequiresLoginException(ApiException): diff --git a/wiremock/exceptions/server_exception.py b/wiremock/exceptions/server_exception.py index 458c967..ccc7e35 100644 --- a/wiremock/exceptions/server_exception.py +++ b/wiremock/exceptions/server_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class ServerException(ApiException): diff --git a/wiremock/exceptions/timeout_exception.py b/wiremock/exceptions/timeout_exception.py index 7f7049c..fee4e76 100644 --- a/wiremock/exceptions/timeout_exception.py +++ b/wiremock/exceptions/timeout_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class TimeoutException(ApiException): diff --git a/wiremock/exceptions/unexpected_response_exception.py b/wiremock/exceptions/unexpected_response_exception.py index 5b1b3e9..3a674fe 100644 --- a/wiremock/exceptions/unexpected_response_exception.py +++ b/wiremock/exceptions/unexpected_response_exception.py @@ -1,4 +1,4 @@ -from api_exception import ApiException +from .api_exception import ApiException class UnexpectedResponseException(ApiException): diff --git a/wiremock/resources/mappings/__init__.py b/wiremock/resources/mappings/__init__.py index 9c066ab..d59a1a7 100644 --- a/wiremock/resources/mappings/__init__.py +++ b/wiremock/resources/mappings/__init__.py @@ -1,3 +1,3 @@ -from models import Mapping, MappingResponse, MappingRequest, DelayDistribution, ResponseFaultType, \ +from .models import Mapping, MappingResponse, MappingRequest, DelayDistribution, ResponseFaultType, \ DelayDistributionMethods, BasicAuthCredentials, WireMockMatchers, HttpMethods, CommonHeaders, \ MappingMeta, AllMappings diff --git a/wiremock/resources/near_misses/__init__.py b/wiremock/resources/near_misses/__init__.py index 5d6c203..9112388 100644 --- a/wiremock/resources/near_misses/__init__.py +++ b/wiremock/resources/near_misses/__init__.py @@ -1,2 +1,2 @@ -from models import NearMissMatchResponse, NearMissMatchRequest, NearMissMatchResult, NearMissRequestPatternResult, \ +from .models import NearMissMatchResponse, NearMissMatchRequest, NearMissMatchResult, NearMissRequestPatternResult, \ NearMissMatch, NearMissMatchPatternRequest diff --git a/wiremock/resources/requests/__init__.py b/wiremock/resources/requests/__init__.py index 710cf27..2c09ba8 100644 --- a/wiremock/resources/requests/__init__.py +++ b/wiremock/resources/requests/__init__.py @@ -1,2 +1,2 @@ -from models import RequestResponse, RequestResponseDefinition, RequestResponseRequest, RequestCountResponse, \ +from .models import RequestResponse, RequestResponseDefinition, RequestResponseRequest, RequestCountResponse, \ RequestResponseAll, RequestResponseFindResponse, RequestResponseAllMeta diff --git a/wiremock/resources/settings/__init__.py b/wiremock/resources/settings/__init__.py index b57d5c3..fcaed9f 100644 --- a/wiremock/resources/settings/__init__.py +++ b/wiremock/resources/settings/__init__.py @@ -1 +1 @@ -from models import GlobalSetting +from .models import GlobalSetting