Merge pull request #167 from developmentseed/patch/avoid-future-depre…

…cation Patch/avoid future deprecation
developmentseed · Feb 2, 2024 · b4732c0 · b4732c0 · github-actions · Feb 2, 2024
2 parents 1ed838c + 2a6b62a
commit b4732c0
Show file tree

Hide file tree

Showing 4 changed files with 304 additions and 80 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 Note: Minor version `0.X.0` update might break the API, It's recommended to pin `tipg` to minor version: `tipg>=0.1,<0.2`
 
+## [0.6.3] - 2024-02-02
+
+- update pydantic's `Field` usage to avoid 3.0 deprecation
+- update starlette's `TemplateResponse' usage to avoid deprecation
+
 ## [0.6.2] - 2024-01-19
 
 - add `root_path` API settings
@@ -281,7 +286,8 @@ Note: Minor version `0.X.0` update might break the API, It's recommended to pin
 
 - Initial release
 
-[unreleased]: https://github.com/developmentseed/tipg/compare/0.6.2...HEAD
+[unreleased]: https://github.com/developmentseed/tipg/compare/0.6.3...HEAD
+[0.6.3]: https://github.com/developmentseed/tipg/compare/0.6.2...0.6.3
 [0.6.2]: https://github.com/developmentseed/tipg/compare/0.6.1...0.6.2
 [0.6.1]: https://github.com/developmentseed/tipg/compare/0.6.0...0.6.1
 [0.6.0]: https://github.com/developmentseed/tipg/compare/0.5.7...0.6.0

diff --git a/tipg/collections.py b/tipg/collections.py
@@ -160,7 +160,7 @@ class Collection(BaseModel):
     type: str
     id: str
     table: str
-    dbschema: str = Field(..., alias="schema")
+    dbschema: str = Field(alias="schema")
     title: Optional[str] = None
     description: Optional[str] = None
     table_columns: List[Column] = []

diff --git a/tipg/factory.py b/tipg/factory.py
@@ -139,9 +139,9 @@ def create_html_response(
         baseurl += router_prefix
 
     return templates.TemplateResponse(
-        f"{template_name}.html",
-        {
-            "request": request,
+        request,
+        name=f"{template_name}.html",
+        context={
             "response": orjson.loads(data),
             "template": {
                 "api_root": baseurl,
@@ -1829,9 +1829,9 @@ def viewer_endpoint(
                     tilejson_url += f"?{urlencode(request.query_params._list)}"
 
                 return self.templates.TemplateResponse(
+                    request,
                     name="map.html",
                     context={
-                        "request": request,
                         "tilejson_endpoint": tilejson_url,
                     },
                     media_type="text/html",