diff --git a/examples/httpbin/basic_test.py b/examples/httpbin/basic_test.py index 24cd405e..b74d7c1d 100644 --- a/examples/httpbin/basic_test.py +++ b/examples/httpbin/basic_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/httpbin/basic.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/httpbin/hooks_test.py b/examples/httpbin/hooks_test.py index 0e2cd0b9..aeb92dd3 100644 --- a/examples/httpbin/hooks_test.py +++ b/examples/httpbin/hooks_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/httpbin/hooks.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/httpbin/load_image_test.py b/examples/httpbin/load_image_test.py index 36453b6c..16a9044c 100644 --- a/examples/httpbin/load_image_test.py +++ b/examples/httpbin/load_image_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/httpbin/load_image.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/httpbin/upload_test.py b/examples/httpbin/upload_test.py index 53ce4461..d89d30f9 100644 --- a/examples/httpbin/upload_test.py +++ b/examples/httpbin/upload_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/httpbin/upload.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/httpbin/validate_test.py b/examples/httpbin/validate_test.py index c9115e60..8e7d8618 100644 --- a/examples/httpbin/validate_test.py +++ b/examples/httpbin/validate_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/httpbin/validate.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/postman_echo/cookie_manipulation/set_delete_cookies.py b/examples/postman_echo/cookie_manipulation/set_delete_cookies.py index b2e3bf26..43ddabfb 100644 --- a/examples/postman_echo/cookie_manipulation/set_delete_cookies.py +++ b/examples/postman_echo/cookie_manipulation/set_delete_cookies.py @@ -2,7 +2,7 @@ import unittest import requests from httprunner.runner import HttpRunner -from httprunner.schema import TConfig, TStep +from httprunner.models import TConfig, TStep class TestCaseSetDeleteCookies(unittest.TestCase): diff --git a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py index 345887c2..474e99c2 100644 --- a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py +++ b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/request_with_functions.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py index ca0232b9..09e9f7c2 100644 --- a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py +++ b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml import os diff --git a/examples/postman_echo/request_methods/hardcode_test.py b/examples/postman_echo/request_methods/hardcode_test.py index 09fa0cfd..a499659b 100644 --- a/examples/postman_echo/request_methods/hardcode_test.py +++ b/examples/postman_echo/request_methods/hardcode_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/hardcode.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/postman_echo/request_methods/request_with_functions_test.py b/examples/postman_echo/request_methods/request_with_functions_test.py index 99a103e9..340749f5 100644 --- a/examples/postman_echo/request_methods/request_with_functions_test.py +++ b/examples/postman_echo/request_methods/request_with_functions_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/request_with_functions.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/postman_echo/request_methods/request_with_testcase_reference_test.py b/examples/postman_echo/request_methods/request_with_testcase_reference_test.py index 24a5d107..837dff4d 100644 --- a/examples/postman_echo/request_methods/request_with_testcase_reference_test.py +++ b/examples/postman_echo/request_methods/request_with_testcase_reference_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml import os diff --git a/examples/postman_echo/request_methods/request_with_variables_test.py b/examples/postman_echo/request_methods/request_with_variables_test.py index ecfa1586..47eff628 100644 --- a/examples/postman_echo/request_methods/request_with_variables_test.py +++ b/examples/postman_echo/request_methods/request_with_variables_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/request_with_variables.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/postman_echo/request_methods/validate_with_functions_test.py b/examples/postman_echo/request_methods/validate_with_functions_test.py index 4378c92b..b077ebc8 100644 --- a/examples/postman_echo/request_methods/validate_with_functions_test.py +++ b/examples/postman_echo/request_methods/validate_with_functions_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/validate_with_functions.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/examples/postman_echo/request_methods/validate_with_variables_test.py b/examples/postman_echo/request_methods/validate_with_variables_test.py index 3c3c0291..c333f462 100644 --- a/examples/postman_echo/request_methods/validate_with_variables_test.py +++ b/examples/postman_echo/request_methods/validate_with_variables_test.py @@ -1,4 +1,4 @@ -# NOTICE: Generated By HttpRunner v3.0.8 +# NOTICE: Generated By HttpRunner v3.0.9 # FROM: examples/postman_echo/request_methods/validate_with_variables.yml from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase diff --git a/httprunner/__init__.py b/httprunner/__init__.py index 5f9324f6..40f1a9c5 100644 --- a/httprunner/__init__.py +++ b/httprunner/__init__.py @@ -1,4 +1,4 @@ -__version__ = "3.0.8" +__version__ = "3.0.9" __description__ = "One-stop solution for HTTP(S) testing." from httprunner.runner import HttpRunner diff --git a/httprunner/app/routers/debug.py b/httprunner/app/routers/debug.py index 9d99f04c..192fbc6e 100644 --- a/httprunner/app/routers/debug.py +++ b/httprunner/app/routers/debug.py @@ -1,7 +1,7 @@ from fastapi import APIRouter from httprunner.runner import HttpRunner -from httprunner.schema import ProjectMeta, TestCase +from httprunner.models import ProjectMeta, TestCase router = APIRouter() runner = HttpRunner() diff --git a/httprunner/client.py b/httprunner/client.py index 01f10e0a..6bba32a3 100644 --- a/httprunner/client.py +++ b/httprunner/client.py @@ -13,8 +13,8 @@ from requests.exceptions import ( ) from sentry_sdk import capture_exception -from httprunner.schema import RequestData, ResponseData -from httprunner.schema import SessionData, ReqRespData +from httprunner.models import RequestData, ResponseData +from httprunner.models import SessionData, ReqRespData from httprunner.utils import lower_dict_keys, omit_long_data urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) diff --git a/httprunner/ext/uploader/__init__.py b/httprunner/ext/uploader/__init__.py index 0d177f65..8768f8b2 100644 --- a/httprunner/ext/uploader/__init__.py +++ b/httprunner/ext/uploader/__init__.py @@ -49,7 +49,7 @@ from typing import Text, NoReturn from loguru import logger from httprunner.parser import parse_variables_mapping -from httprunner.schema import TStep, FunctionsMapping +from httprunner.models import TStep, FunctionsMapping try: import filetype diff --git a/httprunner/loader.py b/httprunner/loader.py index 821c9204..880d5918 100644 --- a/httprunner/loader.py +++ b/httprunner/loader.py @@ -13,7 +13,7 @@ from pydantic import ValidationError from httprunner import builtin, utils from httprunner import exceptions -from httprunner.schema import TestCase, ProjectMeta, TestSuite +from httprunner.models import TestCase, ProjectMeta, TestSuite try: # PyYAML version >= 5.1 diff --git a/httprunner/schema.py b/httprunner/models.py similarity index 100% rename from httprunner/schema.py rename to httprunner/models.py diff --git a/httprunner/parser.py b/httprunner/parser.py index c36363ee..74f4f69e 100644 --- a/httprunner/parser.py +++ b/httprunner/parser.py @@ -6,7 +6,7 @@ from typing import Any, Set, Text, Callable, List, Dict from sentry_sdk import capture_exception from httprunner import loader, utils, exceptions -from httprunner.schema import VariablesMapping, FunctionsMapping +from httprunner.models import VariablesMapping, FunctionsMapping absolute_http_url_regexp = re.compile(r"^https?://", re.I) diff --git a/httprunner/response.py b/httprunner/response.py index 9a62c708..41171271 100644 --- a/httprunner/response.py +++ b/httprunner/response.py @@ -6,7 +6,7 @@ from loguru import logger from httprunner.exceptions import ValidationFailure, ParamsError from httprunner.parser import parse_data, parse_string_value, get_mapping_function -from httprunner.schema import VariablesMapping, Validators, FunctionsMapping +from httprunner.models import VariablesMapping, Validators, FunctionsMapping def get_uniform_comparator(comparator: Text): diff --git a/httprunner/runner.py b/httprunner/runner.py index b90886ea..4a3e77be 100644 --- a/httprunner/runner.py +++ b/httprunner/runner.py @@ -21,7 +21,7 @@ from httprunner.loader import load_project_meta, load_testcase_file from httprunner.parser import build_url, parse_data, parse_variables_mapping from httprunner.response import ResponseObject from httprunner.testcase import Config, Step -from httprunner.schema import ( +from httprunner.models import ( TConfig, TStep, VariablesMapping, diff --git a/httprunner/testcase.py b/httprunner/testcase.py index fc738851..3d9f8c3a 100644 --- a/httprunner/testcase.py +++ b/httprunner/testcase.py @@ -1,7 +1,7 @@ import inspect from typing import Text, Any, Union, Callable -from httprunner.schema import ( +from httprunner.models import ( TConfig, TStep, TRequest, diff --git a/pyproject.toml b/pyproject.toml index 2b239b6a..23324ab6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "httprunner" -version = "3.0.8" +version = "3.0.9" description = "One-stop solution for HTTP(S) testing." license = "Apache-2.0" readme = "README.md"