Pydantic >= 2.0 compatibility

.github/workflows/vulnerabilities.yml

@@ -21,6 +21,10 @@ jobs:
       run:
         working-directory: .
     steps:
+    - id: string
+      uses: ASzc/change-string-case-action
+      with:
+        string: ${{ github.repository }}
     - name: Checkout pygeoapi
       uses: actions/checkout@v4
     - name: Scan vulnerabilities with trivy
@@ -34,7 +38,7 @@ jobs:
         scan-ref: .
     - name: Build locally the image from Dockerfile
       run: |
-        docker buildx build -t ${{ github.repository }}:${{ github.sha }} --platform linux/amd64 --no-cache -f Dockerfile .
+        docker buildx build -t ${{ steps.string.outputs.lowercase }}:${{ github.sha }} --platform linux/amd64 --no-cache -f Dockerfile .
     - name: Scan locally built Docker image for vulnerabilities with trivy
       uses: aquasecurity/trivy-action@master
       with:
@@ -43,4 +47,4 @@ jobs:
         ignore-unfixed: true
         severity: CRITICAL,HIGH
         vuln-type: os,library
-        image-ref: '${{ github.repository }}:${{ github.sha }}'
+        image-ref: '${{ steps.string.outputs.lowercase }}:${{ github.sha }}'

pygeoapi/models/config.py

@@ -31,7 +31,11 @@
 #
 # =================================================================
 
-from pydantic import BaseModel, Field
+try:
+    from pydantic.v1 import BaseModel, Field
+except ModuleNotFoundError:
+    # Pydantic version < 2.0
+    from pydantic import BaseModel, Field
 
 
 class APIRules(BaseModel):

pygeoapi/models/cql.py

@@ -35,7 +35,11 @@
 from datetime import date, datetime
 from typing import Any, List, Literal, Optional, Union
 
-from pydantic import BaseModel, Field
+try:
+    from pydantic.v1 import BaseModel, Field
+except ModuleNotFoundError:
+    # Pydantic version < 2.0
+    from pydantic import BaseModel, Field
 
 
 class CQLModel(BaseModel):

pygeoapi/models/openapi.py

@@ -31,7 +31,11 @@
 
 from enum import Enum
 
-from pydantic import BaseModel
+try:
+    from pydantic.v1 import BaseModel, Field
+except ModuleNotFoundError:
+    # Pydantic version < 2.0
+    from pydantic import BaseModel, Field
 
 
 class SupportedFormats(Enum):

pygeoapi/models/provider/base.py

@@ -35,7 +35,11 @@
 from enum import Enum
 from typing import List, Optional
 
-from pydantic import BaseModel
+try:
+    from pydantic.v1 import BaseModel
+except ModuleNotFoundError:
+    # Pydantic version < 2.0
+    from pydantic import BaseModel
 
 
 class TilesMetadataFormat(str, Enum):

pygeoapi/models/provider/mvt.py

@@ -27,7 +27,11 @@
 #
 # =================================================================
 
-from pydantic import BaseModel
+try:
+    from pydantic.v1 import BaseModel
+except ModuleNotFoundError:
+    # Pydantic version < 2.0
+    from pydantic import BaseModel
 from typing import List, Optional
 
 

requirements-django.txt

@@ -1,2 +1,2 @@
 Django
-pydantic<2.0
+pydantic

requirements.txt

@@ -4,7 +4,7 @@ filelock
 Flask
 jinja2
 jsonschema
-pydantic<2.0
+pydantic
 pygeofilter
 pygeoif
 pyproj