From 9cd644c9dbde2c871a5dee5249d510e265864407 Mon Sep 17 00:00:00 2001 From: SarahG-579462 Date: Thu, 16 May 2024 20:37:15 +0000 Subject: [PATCH 1/2] well that was easy... --- pygeoapi/models/config.py | 6 +++++- pygeoapi/models/cql.py | 6 +++++- pygeoapi/models/openapi.py | 6 +++++- pygeoapi/models/provider/base.py | 6 +++++- pygeoapi/models/provider/mvt.py | 6 +++++- requirements-django.txt | 2 +- requirements.txt | 2 +- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/pygeoapi/models/config.py b/pygeoapi/models/config.py index 2aa6717b7..00b7b96d4 100644 --- a/pygeoapi/models/config.py +++ b/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): diff --git a/pygeoapi/models/cql.py b/pygeoapi/models/cql.py index f803d9288..8d5783dda 100644 --- a/pygeoapi/models/cql.py +++ b/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): diff --git a/pygeoapi/models/openapi.py b/pygeoapi/models/openapi.py index d07923612..54b9169fe 100644 --- a/pygeoapi/models/openapi.py +++ b/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): diff --git a/pygeoapi/models/provider/base.py b/pygeoapi/models/provider/base.py index 844590ee4..b128cb729 100644 --- a/pygeoapi/models/provider/base.py +++ b/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): diff --git a/pygeoapi/models/provider/mvt.py b/pygeoapi/models/provider/mvt.py index c3344150d..6793ef96f 100644 --- a/pygeoapi/models/provider/mvt.py +++ b/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 diff --git a/requirements-django.txt b/requirements-django.txt index c67c59657..ef3e3ec82 100644 --- a/requirements-django.txt +++ b/requirements-django.txt @@ -1,2 +1,2 @@ Django -pydantic<2.0 +pydantic diff --git a/requirements.txt b/requirements.txt index ef0f47d81..22a16a49a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ filelock Flask jinja2 jsonschema -pydantic<2.0 +pydantic pygeofilter pygeoif pyproj From 8d93f59521e3b481c916cfb2599862291b5dfcc1 Mon Sep 17 00:00:00 2001 From: SarahG-579462 Date: Thu, 16 May 2024 20:52:49 +0000 Subject: [PATCH 2/2] fix GH actions for uppercase'd repo names --- .github/workflows/vulnerabilities.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vulnerabilities.yml b/.github/workflows/vulnerabilities.yml index 3252252ed..de36b8624 100644 --- a/.github/workflows/vulnerabilities.yml +++ b/.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 }}'