Skip to content

Commit

Permalink
Merge branch 'BRGM:master' into bug/240_make_form_code_optional
Browse files Browse the repository at this point in the history
  • Loading branch information
frida-161 authored Oct 10, 2022
2 parents 4a9e1f1 + 79c2ba8 commit 707bf8c
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v3

- name: Setup Python
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v3

- name: Setup Python
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v3

- name: Setup Python
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Python
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tester.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Get source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python
uses: actions/[email protected]
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

steps:
- name: Get source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print QGIS version
run: qgis --version
Expand Down
2 changes: 2 additions & 0 deletions gml_application_schema_toolbox/core/load_gmlas_in_qgis.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ def import_in_qgis(
}
sql = f"select o.layer_name, o.layer_xpath, o.layer_category, o.layer_pkid_name, o.layer_parent_pkid_name, g.f_geometry_column, g.srid from {schema_s}_ogr_layers_metadata o left join geometry_columns g on g.f_table_name = o.layer_name"
PlgLogger.log(message=f"DEBUG Get list of layers with query : {sql}", log_level=4)

result = []
try:
result = conn.executeSql(sql)
PlgLogger.log(message=f"DEBUG List of layers : {result}", log_level=4)
Expand Down
2 changes: 1 addition & 1 deletion requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
black
flake8>=3.8,<4.1
flake8-builtins>=1.5,<1.6
flake8-eradicate>=1.0,<1.4
flake8-eradicate>=1.0,<1.5
flake8-isort>=4.0,<4.3
pre-commit>=2.12,<2.21
2 changes: 1 addition & 1 deletion requirements/documentation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -------------

ghp-import>=2.0,<2.2
furo==2022.6.21
furo==2022.9.29
myst-parser[linkify]>=0.15,<0.19
sphinx-autobuild==2021.3.14
sphinx-copybutton>=0.3,<1
Expand Down
2 changes: 1 addition & 1 deletion requirements/packaging.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Packaging
# ---------

qgis-plugin-ci>=2.0,<2.4
qgis-plugin-ci>=2.0,<2.6

0 comments on commit 707bf8c

Please sign in to comment.