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

feat(qdt): update url for json schema #6

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
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
8 changes: 3 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repos:
files: ^profiles/.*\.json$
args:
- --schemafile
- https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/profile/qgis_profile.json
- https://github.com/qgis-deployment/qgis-deployment-toolbelt-cli/raw/main/docs/schemas/profile/qgis_profile.json

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.0
Expand All @@ -45,12 +45,10 @@ repos:
args:
- --default-filetype
- yaml
- --base-uri
- https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/scenario/
- --schemafile
- https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/scenario/schema.json
- https://github.com/qgis-deployment/qgis-deployment-toolbelt-cli/raw/main/docs/schemas/scenario/qdt_scenario.json

ci:
autoupdate_schedule: quarterly
skip: []
skip: [check-jsonschema]
submodules: false
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"requirements*.txt": "pip-requirements"
},
"yaml.schemas": {
"https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/scenario/schema.json": [
"https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/scenario/schema.json": [
"**/*scenario*qdt.yml"
]
},
Expand Down
10 changes: 4 additions & 6 deletions profiles/Loire_aval/profile.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/profile/qgis_profile.json",
"$schema": "https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/profile/qgis_profile.json",
"name": "loire_aval",
"description": "Profil pour les utilisateurs situés sur la Loire aval, De la confluence de l'Indre jusqu'à la mer.",
"author": "Emilie BIGORNE",
Expand Down Expand Up @@ -30,22 +30,20 @@
"version": "1.1.",
"official_repository": true,
"plugin_id": 1846
}
,
},
{
"name": "Custom News Feed",
"folder_name": "custom_news_feed",
"version": "v1.2.3",
"official_repository": true,
"plugin_id": 2691
}
,
},
{
"name": "Data Plotly",
"folder_name": "DataPlotly",
"version": "4.1.0",
"official_repository": true,
"plugin_id": 1247
}
}
]
}
10 changes: 4 additions & 6 deletions profiles/axe_loire/profile.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/profile/qgis_profile.json",
"$schema": "https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/profile/qgis_profile.json",
"name": "axe_loire",
"description": "Profil pour les utilisateurs situés sur l'axe Loire, de la confluence avec l'Allier jusq'à la confluence avec l'Indre",
"author": "Emilie BIGORNE",
Expand Down Expand Up @@ -30,22 +30,20 @@
"version": "1.1.1",
"official_repository": true,
"plugin_id": 1846
}
,
},
{
"name": "Custom News Feed",
"folder_name": "custom_news_feed",
"version": "v1.2.3",
"official_repository": true,
"plugin_id": 2691
}
,
},
{
"name": "Data Plotly",
"folder_name": "DataPlotly",
"version": "4.1.0",
"official_repository": true,
"plugin_id": 1247
}
}
]
}
2 changes: 1 addition & 1 deletion profiles/cadastre/profile.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
"version": "v1.2.3",
"official_repository": true,
"plugin_id": 2691
}
}
]
}
10 changes: 4 additions & 6 deletions profiles/cher/profile.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/profile/qgis_profile.json",
"$schema": "https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/profile/qgis_profile.json",
"name": "cher",
"description": "Profil pour les utilisateurs situés sur le bassin du Cher.",
"author": "Emilie BIGORNE",
Expand Down Expand Up @@ -30,22 +30,20 @@
"version": "1.1.1",
"official_repository": true,
"plugin_id": 1846
}
,
},
{
"name": "Custom News Feed",
"folder_name": "custom_news_feed",
"version": "v1.2.3",
"official_repository": true,
"plugin_id": 2691
}
,
},
{
"name": "Data Plotly",
"folder_name": "DataPlotly",
"version": "4.1.0",
"official_repository": true,
"plugin_id": 1247
}
}
]
}
10 changes: 4 additions & 6 deletions profiles/haut_bassin/profile.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/profile/qgis_profile.json",
"$schema": "https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/profile/qgis_profile.json",
"name": "haut_bassin",
"description": "Profil pour les utilisateurs situés sur la haut bassin de la Loire : bassin de l'Allier et de la Loire en amont de leur confluence",
"author": "Emilie BIGORNE",
Expand Down Expand Up @@ -30,22 +30,20 @@
"version": "1.1.1",
"official_repository": true,
"plugin_id": 1846
}
,
},
{
"name": "Custom News Feed",
"folder_name": "custom_news_feed",
"version": "v1.2.3",
"official_repository": true,
"plugin_id": 2691
}
,
},
{
"name": "Data Plotly",
"folder_name": "DataPlotly",
"version": "4.1.0",
"official_repository": true,
"plugin_id": 1247
}
}
]
}
10 changes: 4 additions & 6 deletions profiles/maine/profile.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/profile/qgis_profile.json",
"$schema": "https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/profile/qgis_profile.json",
"name": "maine",
"description": "Profil pour les utilisateurs situés sur le bassin de la Maine",
"author": "Emilie BIGORNE",
Expand Down Expand Up @@ -30,22 +30,20 @@
"version": "1.1.1",
"official_repository": true,
"plugin_id": 1846
}
,
},
{
"name": "Custom News Feed",
"folder_name": "custom_news_feed",
"version": "v1.2.3",
"official_repository": true,
"plugin_id": 2691
}
,
},
{
"name": "Data Plotly",
"folder_name": "DataPlotly",
"version": "4.1.0",
"official_repository": true,
"plugin_id": 1247
}
}
]
}
12 changes: 5 additions & 7 deletions profiles/support/profile.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/profile/qgis_profile.json",
"$schema": "https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/profile/qgis_profile.json",
"name": "EP Loire support",
"folder_name": "epl_support",
"description": "Test support",
Expand Down Expand Up @@ -31,22 +31,20 @@
"version": "1.1.1",
"official_repository": true,
"plugin_id": 1846
}
,
},
{
"name": "Custom News Feed",
"folder_name": "custom_news_feed",
"version": "v1.2.3",
"official_repository": true,
"plugin_id": 2691
}
,
},
{
"name": "Data Plotly",
"folder_name": "DataPlotly",
"version": "4.1.0",
"official_repository": true,
"plugin_id": 1247
}
}
]
}
}
25 changes: 12 additions & 13 deletions qdt_scenarii/scenario.qdt.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/Guts/qgis-deployment-cli/main/docs/schemas/scenario/schema.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/qgis-deployment/qgis-deployment-toolbelt-cli/main/docs/schemas/scenario/schema.json

metadata:
title: "Profile EP Loire"
Expand All @@ -13,11 +13,10 @@ settings:

# Deployment workflow, step by step
steps:

- name: Set environment variables
uses: manage-env-vars
with:
- name: QDT_QGIS_EXE_PATH
- name: QDT_QGIS_EXE_PATH
action: "add"
scope: "user"
value: "C:\\QGIS\\3_28\\bin\\qgis-ltr-bin.exe"
Expand All @@ -26,7 +25,7 @@ steps:
- name: Set environment variables
uses: manage-env-vars
with:
- name: QDT_QGIS_EXE_PATH
- name: QDT_QGIS_EXE_PATH
action: "add"
scope: "user"
value: "C:\\QGIS\\3_34\\bin\\qgis-ltr-bin.exe"
Expand All @@ -35,10 +34,10 @@ steps:
- name: Find installed QGIS
uses: qgis-installation-finder
with:
version_priority:
- "3.34"
- "3.28"
if_not_found: error
- version_priority:
- "3.34"
- "3.28"
- if_not_found: error

- name: Download profiles from remote git repository
uses: qprofiles-downloader
Expand Down Expand Up @@ -88,30 +87,30 @@ steps:
start_menu: true
additional_arguments: "--noversioncheck"
action: create_or_restore
icon: "images/qgis_icone_eploire.ico"
icon: "images/qgis_icone_eploire.ico"
- profile: haut_bassin
label: "Qgis Allier et Loire amont"
desktop: true
start_menu: true
additional_arguments: "--noversioncheck"
action: create_or_restore
icon: "images/qgis_icone_eploire.ico"
icon: "images/qgis_icone_eploire.ico"
- profile: loire_aval
label: "Qgis Loire aval"
desktop: true
start_menu: true
additional_arguments: "--noversioncheck"
action: create_or_restore
icon: "images/qgis_icone_eploire.ico"
icon: "images/qgis_icone_eploire.ico"
- profile: maine
label: "QGis bassin de la Maine"
desktop: true
start_menu: true
additional_arguments: "--noversioncheck"
action: create_or_restore
icon: "images/qgis_icone_eploire.ico"
icon: "images/qgis_icone_eploire.ico"
- name: Set splash screen
uses: splash-screen-manager
with:
action: create_or_restore
strict: false
strict: false