diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b522930a945..77fbb9ccf98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -491,8 +491,7 @@ jobs: with: version_file_path: 'pydantic/version.py' - # need to remove "latest" once V2 is released! - - run: mike deploy -b docs-site ${{ steps.check-version.outputs.VERSION_MAJOR_MINOR }} latest --update-aliases --push + - run: mike deploy -b docs-site ${{ steps.check-version.outputs.VERSION_MAJOR_MINOR }} --update-aliases --push if: "startsWith(github.ref, 'refs/tags/') && !fromJSON(steps.check-version.outputs.IS_PRERELEASE)" release: diff --git a/HISTORY.md b/HISTORY.md index b129569a4f7..37e324ef6e7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,7 @@ +## v1.10.11 (2023-07-04) + +* Importing create_model in tools.py through relative path instead of absolute path - so that it doesn't import V2 code when copied over to V2 branch, #6361 by @SharathHuddar + ## v2.0b3 (2023-06-16) Third beta pre-release of Pydantic V2 diff --git a/pydantic/tools.py b/pydantic/tools.py index 9cdb4538eb5..45be27704cb 100644 --- a/pydantic/tools.py +++ b/pydantic/tools.py @@ -21,7 +21,7 @@ def _generate_parsing_type_name(type_: Any) -> str: @lru_cache(maxsize=2048) def _get_parsing_type(type_: Any, *, type_name: Optional[NameFactory] = None) -> Any: - from pydantic.main import create_model + from .main import create_model if type_name is None: type_name = _generate_parsing_type_name diff --git a/pydantic/version.py b/pydantic/version.py index b7114b49d9c..49ddd535f09 100644 --- a/pydantic/version.py +++ b/pydantic/version.py @@ -1,6 +1,6 @@ __all__ = 'compiled', 'VERSION', 'version_info' -VERSION = '1.10.10' +VERSION = '1.10.11' try: import cython # type: ignore