Skip to content

Commit

Permalink
fix with correct thirdparty
Browse files Browse the repository at this point in the history
  • Loading branch information
ciaran committed Dec 5, 2023
1 parent 490198a commit 75af527
Show file tree
Hide file tree
Showing 26 changed files with 11 additions and 37 deletions.
1 change: 0 additions & 1 deletion tests/aiohttp/test_aiohttp_api_secure.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from unittest.mock import MagicMock

import pytest

from firetail import AioHttpApp


Expand Down
1 change: 0 additions & 1 deletion tests/aiohttp/test_aiohttp_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import pytest
from conftest import TEST_FOLDER

from firetail import AioHttpApp
from firetail.exceptions import FiretailException

Expand Down
1 change: 0 additions & 1 deletion tests/aiohttp/test_aiohttp_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import aiohttp.test_utils
import pytest

from firetail import AioHttpApp
from firetail.apis.aiohttp_api import HTTPStatus

Expand Down
1 change: 0 additions & 1 deletion tests/aiohttp/test_aiohttp_multipart.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import aiohttp
import pytest

from firetail import AioHttpApp

try:
Expand Down
3 changes: 1 addition & 2 deletions tests/aiohttp/test_aiohttp_reverse_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
from aiohttp import web
from aiohttp_remotes.exceptions import RemoteError, TooManyHeaders
from aiohttp_remotes.x_forwarded import XForwardedBase
from yarl import URL

from firetail import AioHttpApp
from yarl import URL

X_FORWARDED_PATH = "X-Forwarded-Path"

Expand Down
1 change: 0 additions & 1 deletion tests/aiohttp/test_aiohttp_simple_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import pytest
import yaml
from conftest import TEST_FOLDER

from firetail import AioHttpApp

try:
Expand Down
1 change: 0 additions & 1 deletion tests/aiohttp/test_get_response.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import pytest
from aiohttp import web

from firetail.apis.aiohttp_api import AioHttpApi
from firetail.lifecycle import FiretailResponse

Expand Down
1 change: 0 additions & 1 deletion tests/api/test_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import pytest
import yaml
from conftest import TEST_FOLDER, build_app_from_fixture

from firetail import App
from firetail.exceptions import InvalidSpecification
from firetail.http_facts import METHODS
Expand Down
3 changes: 1 addition & 2 deletions tests/api/test_responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
from struct import unpack

import yaml
from werkzeug.test import Client, EnvironBuilder

from firetail.apps.flask_app import FlaskJSONEncoder
from werkzeug.test import Client, EnvironBuilder


def test_app(simple_app):
Expand Down
1 change: 0 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import sys

import pytest

from firetail import App
from firetail.security import FlaskSecurityHandlerFactory

Expand Down
1 change: 0 additions & 1 deletion tests/decorators/test_security.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import pytest
import requests

from firetail.exceptions import (
BadRequestProblem,
FiretailException,
Expand Down
3 changes: 1 addition & 2 deletions tests/decorators/test_uri_parsing.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import pytest
from werkzeug.datastructures import MultiDict

from firetail.decorators.uri_parsing import (
AlwaysMultiURIParser,
FirstValueURIParser,
OpenAPIURIParser,
Swagger2URIParser,
)
from werkzeug.datastructures import MultiDict

QUERY1 = MultiDict([("letters", "a"), ("letters", "b,c"), ("letters", "d,e,f")])
QUERY2 = MultiDict([("letters", "a"), ("letters", "b|c"), ("letters", "d|e|f")])
Expand Down
3 changes: 1 addition & 2 deletions tests/decorators/test_validation.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from unittest.mock import MagicMock

import pytest
from jsonschema import ValidationError

from firetail.apis.flask_api import FlaskApi
from firetail.decorators.validation import ParameterValidator
from firetail.json_schema import Draft4RequestValidator, Draft4ResponseValidator
from jsonschema import ValidationError


def test_get_valid_parameter():
Expand Down
1 change: 0 additions & 1 deletion tests/fakeapi/aiohttp_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import aiohttp
from aiohttp.web import Request
from aiohttp.web import Response as AioHttpResponse

from firetail.lifecycle import FiretailResponse


Expand Down
3 changes: 1 addition & 2 deletions tests/fakeapi/hello/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
import datetime
import uuid

from flask import jsonify, redirect, send_file

from firetail import NoContent, ProblemException, context, request
from firetail.exceptions import OAuthProblem
from flask import jsonify, redirect, send_file


class DummyClass:
Expand Down
3 changes: 1 addition & 2 deletions tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
from unittest.mock import MagicMock

import pytest
from yaml import YAMLError

from firetail import FlaskApi
from firetail.exceptions import InvalidSpecification, ResolverError
from firetail.spec import canonical_base_path
from yaml import YAMLError

TEST_FOLDER = pathlib.Path(__file__).parent

Expand Down
3 changes: 1 addition & 2 deletions tests/test_app.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from flask import Flask

from firetail.apis.flask_api import FlaskApi
from firetail.apps.flask_app import FlaskApp
from flask import Flask


def test_flask_app_default_params():
Expand Down
3 changes: 1 addition & 2 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import logging
from unittest.mock import MagicMock

import firetail
import pytest
from click.testing import CliRunner
from conftest import FIXTURES_FOLDER

import firetail
from firetail.cli import main


Expand Down
1 change: 0 additions & 1 deletion tests/test_flask_encoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import pytest
from conftest import build_app_from_fixture

from firetail.apps.flask_app import FlaskJSONEncoder

SPECS = ["swagger.yaml", "openapi.yaml"]
Expand Down
3 changes: 1 addition & 2 deletions tests/test_json_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@

import pytest
from conftest import build_app_from_fixture
from jsonschema.validators import _utils, extend

from firetail import App
from firetail.decorators.validation import RequestBodyValidator
from firetail.json_schema import Draft4RequestValidator
from firetail.spec import Specification
from jsonschema.validators import _utils, extend

SPECS = ["swagger.yaml", "openapi.yaml"]

Expand Down
1 change: 0 additions & 1 deletion tests/test_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import flask
import pytest

from firetail.decorators.metrics import UWSGIMetricsCollector
from firetail.exceptions import ProblemException

Expand Down
1 change: 0 additions & 1 deletion tests/test_operation2.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from unittest import mock

import pytest

from firetail.apis.flask_api import Jsonifier
from firetail.exceptions import InvalidSpecification
from firetail.json_schema import resolve_refs
Expand Down
1 change: 0 additions & 1 deletion tests/test_references.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from unittest import mock

import pytest

from firetail.apis.flask_api import Jsonifier
from firetail.json_schema import RefResolutionError, resolve_refs

Expand Down
3 changes: 1 addition & 2 deletions tests/test_resolver.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import pytest

import firetail.apps
import pytest
from firetail.exceptions import ResolverError
from firetail.operations import Swagger2Operation
from firetail.resolver import RelativeResolver, Resolver, RestyResolver
Expand Down
3 changes: 1 addition & 2 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import math
from unittest.mock import MagicMock

import pytest

import firetail.apps
import pytest
from firetail import utils


Expand Down
1 change: 0 additions & 1 deletion tests/test_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import flask
import pytest

from firetail.apis.flask_api import FlaskApi
from firetail.decorators.validation import ParameterValidator
from firetail.exceptions import BadRequestProblem
Expand Down

0 comments on commit 75af527

Please sign in to comment.