merged master, fixed flicts

newhouse · newhouse · commit 3999ca240e8f · 2024-12-16T18:07:22.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 4.0.0 (2024-07-23)
+
+- Updated `pydantic` package dependency to `v2`, but still using `v1` internally.
+- **[BREAKING CHANGE]** Python requirement is now `>= 3.8.0`, up from `>= 3.7.2`.
+
 # 3.0.1 (2023-06-28)
 
 - Fixed issue with `requests_toolbelt` (`gql` dependency) using an incompatible version of `urllib3`.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,2 @@
-mkdocs==1.4.2 ; python_full_version >= "3.7.2" and python_version < "3.12"
-pygments==2.14.0 ; python_full_version >= "3.7.2" and python_version < "3.12"
+mkdocs==1.4.2 ; python_full_version >= "3.8.0" and python_version < "3.12"
+pygments==2.14.0 ; python_full_version >= "3.8.0" and python_version < "3.12"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "python_anvil"
-version = "3.0.1"
+version = "4.0.0"
 description = "Anvil API"
 license = "MIT"
 authors = ["Anvil Foundry Inc. <developers@useanvil.com>"]
diff --git a/python_anvil/api_resources/payload.py b/python_anvil/api_resources/payload.py
@@ -180,7 +180,7 @@ class DocumentUpload(FileCompatibleBaseModel):
     # This might be a bug on the `pydantic` side(?) when this object gets
     # converted into a dict.
 
-    # NOTE: This field name is referenced in the models.py file, if you change it you 
+    # NOTE: This field name is referenced in the models.py file, if you change it you
     #   must change the reference
     file: Any = None
     fields: List[SignatureField]
