Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ [maykinmedia/open-api-framework#117] Upgrade dependencies #549

Merged
merged 5 commits into from
Mar 13, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -14,12 +14,26 @@ env:

jobs:
tests:
name: Run the Django test suite
strategy:
matrix:
postgres: ['13', '15', '16', '17']
postgis: ['3.2', '3.5']
exclude:
# postgis 3.2 is not compatible with recent postgres versions
- postgres: '17'
postgis: '3.2'
- postgres: '16'
postgis: '3.2'
- postgres: '15'
postgis: '3.2'

name: Run the Django test suite (PG ${{ matrix.postgres }}, postgis ${{ matrix.postgis }})

runs-on: ubuntu-latest

services:
postgres:
image: postgis/postgis:12-2.5
image: postgis/postgis:${{ matrix.postgres }}-${{ matrix.postgis }}
env:
POSTGRES_HOST_AUTH_METHOD: trust
ports:
@@ -110,7 +124,7 @@ jobs:
id: image-name

open-api-ci:
uses: maykinmedia/open-api-workflows/.github/workflows/ci.yml@v4.1.0
uses: maykinmedia/open-api-workflows/.github/workflows/ci.yml@v5
needs:
- store-reusable-workflow-vars
with:
@@ -122,7 +136,7 @@ jobs:
docker-image-name: ${{ needs.store-reusable-workflow-vars.outputs.image-name }}

open-api-publish:
uses: maykinmedia/open-api-workflows/.github/workflows/publish.yml@v3.0.2
uses: maykinmedia/open-api-workflows/.github/workflows/publish.yml@v5
needs:
- store-reusable-workflow-vars
- open-api-ci
7 changes: 3 additions & 4 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -15,11 +15,10 @@ on:

jobs:
open-api-workflow-code-quality:
uses: maykinmedia/open-api-workflows/.github/workflows/code-quality.yml@v1
uses: maykinmedia/open-api-workflows/.github/workflows/code-quality.yml@v5
with:
apt-packages: 'libgdal-dev gdal-bin'
python-version: '3.11'
node-version: '18'
postgres-image: 'postgis/postgis:12-2.5'

node-version: '20'
postgres-image: 'postgis/postgis:17-3.5'
django-settings-module: 'objects.conf.ci'
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -22,4 +22,4 @@ on:

jobs:
open-api-workflow-code-analysis:
uses: maykinmedia/open-api-workflows/.github/workflows/code-analysis.yml@v1
uses: maykinmedia/open-api-workflows/.github/workflows/code-analysis.yml@v5
4 changes: 2 additions & 2 deletions .github/workflows/generate-postman-collection.yml
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ on:

jobs:
open-api-workflow-generate-postman-collection:
uses: maykinmedia/open-api-workflows/.github/workflows/generate-postman-collection.yml@v1
uses: maykinmedia/open-api-workflows/.github/workflows/generate-postman-collection.yml@v5
strategy:
matrix:
version:
- v2
with:
node-version: '18'
node-version: '20'
schema-path: 'src/objects/api/${{ matrix.version }}/openapi.yaml'
4 changes: 2 additions & 2 deletions .github/workflows/generate-sdks.yml
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ on:

jobs:
open-api-workflow-generate-sdks:
uses: maykinmedia/open-api-workflows/.github/workflows/generate-sdks.yml@v1
uses: maykinmedia/open-api-workflows/.github/workflows/generate-sdks.yml@v5
strategy:
matrix:
version:
- v2
with:
node-version: '18'
node-version: '20'
schema-path: 'src/objects/api/${{ matrix.version }}/openapi.yaml'
4 changes: 2 additions & 2 deletions .github/workflows/lint-oas.yml
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ on:

jobs:
open-api-workflow-lint-oas:
uses: maykinmedia/open-api-workflows/.github/workflows/lint-oas.yml@v1
uses: maykinmedia/open-api-workflows/.github/workflows/lint-oas.yml@v5
strategy:
matrix:
version:
- v2
with:
node-version: '18'
node-version: '20'
schema-path: 'src/objects/api/${{ matrix.version }}/openapi.yaml'
2 changes: 1 addition & 1 deletion .github/workflows/oaf-check.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ on:

jobs:
open-api-workflow-check-oas:
uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@v4
uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@v5

with:
python-version: '3.11'
2 changes: 1 addition & 1 deletion .github/workflows/oas-check.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on:

jobs:
open-api-workflow-check-oas:
uses: maykinmedia/open-api-workflows/.github/workflows/oas-check.yml@v5.0.0
uses: maykinmedia/open-api-workflows/.github/workflows/oas-check.yml@v5
with:
schema-path: 'src/objects/api/v2/openapi.yaml'
schema-options: 'src/objects/api/v2/openapi.yaml'
2 changes: 1 addition & 1 deletion .github/workflows/quick-start.yml
Original file line number Diff line number Diff line change
@@ -11,6 +11,6 @@ on:

jobs:
open-api-workflow-quick-start:
uses: maykinmedia/open-api-workflows/.github/workflows/quick-start.yml@v4.2.0
uses: maykinmedia/open-api-workflows/.github/workflows/quick-start.yml@v5
with:
fixtures: 'demodata'
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
12 changes: 12 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -2,6 +2,18 @@
Change history
==============

3.x.x (2025-03-31)
------------------

**Project maintenance**

* Confirm support for Postgres 17 and drop (verified) support for Postgres 12
* Confirm support for Postgis 3.2/3.5 and drop (verified) support for Postgis 2.5
* Upgrade nodejs version in Docker image to 20
* Upgrade dependencies

* Development tools: black to 25.1.0, flake to 7.1.2 and isort to 6.0.1

3.0.2 (2025-03-07)
------------------

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ RUN pip install -r requirements/production.txt


# Stage 2 - build frontend
FROM node:18-alpine AS frontend-build
FROM node:20-alpine AS frontend-build

WORKDIR /app

2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ You need the following libraries and/or programs:

* `Python`_ 3.11 or above
* Python `Virtualenv`_ and `Pip`_
* `PostgreSQL`_ 12 or above with PostGIS extension
* `PostgreSQL`_ 13 or above with PostGIS extension
* `Node.js`_
* `npm`_

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ services:
db:
# NOTE: No persistance storage configured.
# See: https://hub.docker.com/_/postgres/
image: postgis/postgis:12-2.5
image: postgis/postgis:17-3.5
environment:
- POSTGRES_USER=${DB_USER:-objects}
- POSTGRES_PASSWORD=${DB_PASSWORD:-objects}
4 changes: 2 additions & 2 deletions publiccode.yaml
Original file line number Diff line number Diff line change
@@ -71,10 +71,10 @@ dependsOn:
versionMin: '1.0'
- name: PostgreSQL
optional: false
versionMin: '11.0'
versionMin: '13.0'
- name: PostGIS
optional: false
versionMin: '2.4'
versionMin: '3.2'
- name: Kubernetes
optional: true
versionMin: '1.12'
6 changes: 3 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ billiard==4.2.0
# -c requirements/base.txt
# -r requirements/base.txt
# celery
black==24.8.0
black==25.1.0
# via -r requirements/test-tools.in
bleach==6.1.0
# via
@@ -379,7 +379,7 @@ factory-boy==3.2.0
# via -r requirements/test-tools.in
faker==8.1.0
# via factory-boy
flake8==7.1.1
flake8==7.1.2
# via -r requirements/test-tools.in
flower==2.0.1
# via
@@ -428,7 +428,7 @@ isodate==0.6.0
# -c requirements/base.txt
# -r requirements/base.txt
# commonground-api-common
isort==5.13.2
isort==6.0.1
# via -r requirements/test-tools.in
itypes==1.2.0
# via
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ billiard==4.2.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# celery
black==24.8.0
black==25.1.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
@@ -430,7 +430,7 @@ faker==8.1.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# factory-boy
flake8==7.1.1
flake8==7.1.2
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
@@ -499,7 +499,7 @@ isodate==0.6.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# commonground-api-common
isort==5.13.2
isort==6.0.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt