Skip to content

Commit 91af08f

Browse files
submarcossubmarcos
authored
Merge branch 'master' into ubuntu_resolute
2 parents 047eeff + dd01e41 commit 91af08f

File tree

42 files changed

+257
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+257
-113
lines changed

‎.github/workflows/dependencies.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
actions: write
2727

2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
if: github.event.pull_request.head.repo.full_name != github.repository
3131
with:
3232
ref: ${{ github.head_ref }}
3333

34-
- uses: actions/checkout@v5
34+
- uses: actions/checkout@v6
3535
if: github.event.pull_request.head.repo.full_name == github.repository
3636
with:
3737
token: ${{ secrets.PAT }}

‎.github/workflows/doc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Documentation
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
- uses: astral-sh/setup-uv@v7
2929
with:
3030
version: "latest"

‎.github/workflows/lint.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
name: Checking SRID in migrations files
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
- run: |
1919
test $(ls geotrek/*/migrations/*.py | xargs grep -l srid | xargs grep -L SRID | wc -l) -eq 0
2020
2121
quality:
2222
name: Checking lint rules
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- uses: astral-sh/setup-uv@v7
2727
with:
2828
version: "latest"
@@ -52,12 +52,10 @@ jobs:
5252

5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656
if: github.event.pull_request.head.repo.full_name != github.repository
57-
with:
58-
ref: ${{ github.head_ref }}
5957

60-
- uses: actions/checkout@v5
58+
- uses: actions/checkout@v6
6159
if: github.event.pull_request.head.repo.full_name == github.repository
6260
with:
6361
token: ${{ secrets.PAT }}
@@ -102,4 +100,4 @@ jobs:
102100
with:
103101
# Optional. Commit message for the created commit.
104102
# Defaults to "Apply automatic changes"
105-
commit_message: "Fix translation files"
103+
commit_message: "Fix translation files"

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
actions: write
4444

4545
steps:
46-
- uses: actions/checkout@v5
46+
- uses: actions/checkout@v6
4747
- name: Prepare release
4848
run: |
4949
echo "Preparing release ${{ github.event.inputs.version }}"

‎.github/workflows/test.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- 6379:6379
8181

8282
steps:
83-
- uses: actions/checkout@v5
83+
- uses: actions/checkout@v6
8484
- uses: astral-sh/setup-uv@v7
8585
with:
8686
version: "latest"
@@ -149,7 +149,7 @@ jobs:
149149
./venv/bin/coverage xml -o coverage.xml
150150
151151
- name: Save coverage
152-
uses: actions/upload-artifact@v5
152+
uses: actions/upload-artifact@v6
153153
with:
154154
name: coverage_${{ matrix.os }}_${{ matrix.tests-env }}
155155
path: coverage.xml
@@ -168,8 +168,8 @@ jobs:
168168
OS: ${{ matrix.os }}
169169

170170
steps:
171-
- uses: actions/checkout@v5
172-
- uses: actions/download-artifact@v6
171+
- uses: actions/checkout@v6
172+
- uses: actions/download-artifact@v7
173173
with:
174174
name: coverage_${{ matrix.os }}_${{ matrix.tests-env }}
175175
path: .
@@ -185,7 +185,7 @@ jobs:
185185
name: Build docker image
186186
runs-on: ubuntu-latest
187187
steps:
188-
- uses: actions/checkout@v5
188+
- uses: actions/checkout@v6
189189

190190
- name: Set up Docker Buildx
191191
id: buildx
@@ -224,7 +224,7 @@ jobs:
224224
DISTRO: ubuntu:${{ matrix.os }}
225225

226226
steps:
227-
- uses: actions/checkout@v5
227+
- uses: actions/checkout@v6
228228
- name: Prepare versioning
229229
run: |
230230
grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' VERSION || sed -i 's/+dev/.ubuntu'$CODE'~dev'$GITHUB_RUN_ID'/' debian/changelog
@@ -236,7 +236,7 @@ jobs:
236236
cp ./dpkg/*.deb /home/runner/work/Geotrek-admin/
237237
238238
- name: Archive package artifact
239-
uses: actions/upload-artifact@v5
239+
uses: actions/upload-artifact@v6
240240
with:
241241
name: ${{ matrix.os }}
242242
path: |
@@ -266,7 +266,7 @@ jobs:
266266
- postgres:/var/lib/postgresql/data
267267

268268
steps:
269-
- uses: actions/checkout@v5
269+
- uses: actions/checkout@v6
270270

271271
- name: Download image
272272
uses: ishworkh/[email protected]
@@ -317,7 +317,7 @@ jobs:
317317
continue-on-error: false
318318

319319
- name: Archive results as artifacts
320-
uses: actions/upload-artifact@v5
320+
uses: actions/upload-artifact@v6
321321
with:
322322
name: cypress-docker
323323
path: |
@@ -355,8 +355,8 @@ jobs:
355355
--health-cmd pg_isready
356356
357357
steps:
358-
- uses: actions/checkout@v5
359-
- uses: actions/download-artifact@v6
358+
- uses: actions/checkout@v6
359+
- uses: actions/download-artifact@v7
360360
with:
361361
name: ${{ matrix.os }}
362362

@@ -407,7 +407,7 @@ jobs:
407407
continue-on-error: false
408408

409409
- name: Archive results as artifacts
410-
uses: actions/upload-artifact@v5
410+
uses: actions/upload-artifact@v6
411411
with:
412412
name: cypress-${{ matrix.code }}
413413
path: |
@@ -420,17 +420,17 @@ jobs:
420420
needs: [ test, e2e_docker_image, build_deb, e2e_deb ]
421421
if: ${{ github.event_name != 'pull_request' }}
422422
steps:
423-
- uses: actions/checkout@v5
423+
- uses: actions/checkout@v6
424424

425425
- name: Download 24.04 debian artifact
426426
if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
427-
uses: actions/download-artifact@v6
427+
uses: actions/download-artifact@v7
428428
with:
429429
name: noble
430430

431431
- name: Download 26.04 debian artifact
432432
if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
433-
uses: actions/download-artifact@v6
433+
uses: actions/download-artifact@v7
434434
with:
435435
name: resolute
436436

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.121.0+dev
1+
2.121.2+dev

‎debian/changelog‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
1-
geotrek-admin (2.121.0+dev) UNRELEASED; urgency=medium
1+
geotrek-admin (2.121.2+dev) UNRELEASED; urgency=medium
22

33
* Merging improvements
44

5-
-- Geotrek Team <[email protected]> Fri, 14 Nov 2025 14:33:50 +0000
5+
-- Geotrek Team <[email protected]> Tue, 16 Dec 2025 10:05:48 +0000
6+
7+
geotrek-admin (2.121.2) RELEASED; urgency=medium
8+
9+
* Merging improvements
10+
* New package release
11+
12+
-- Geotrek Team <[email protected]> Tue, 16 Dec 2025 10:05:41 +0000
13+
14+
geotrek-admin (2.121.1) RELEASED; urgency=medium
15+
16+
* Merging improvements
17+
* New package release
18+
19+
-- Geotrek Team <[email protected]> Mon, 17 Nov 2025 15:31:30 +0000
620

721
geotrek-admin (2.121.0) RELEASED; urgency=medium
822

‎docs/changelog.rst‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,25 @@
22
CHANGELOG
33
=========
44

5-
2.121.0+dev (XXXX-XX-XX)
5+
2.121.2+dev (XXXX-XX-XX)
6+
----------------------------
7+
8+
9+
2.121.2 (2025-12-16)
10+
----------------------------
11+
12+
**Bug fixes**
13+
14+
* Fix ``label_en`` content on sensitivity module parser
15+
* Fix restricted area geojson that are not different by type in cache (#5136)
16+
17+
2.121.1 (2025-11-17)
618
----------------------------
719

820
**Bug fixes**
921

1022
* Draft path can be add by user without permission to add regular path
23+
* Fix the email sending and status change processes in the Suricate workflow.
1124

1225

1326
2.121.0 (2025-11-14)

‎docs/import-data/development.rst‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,45 @@ Execution flow diagram
8484
Configurable built-in parsers
8585
=============================
8686

87+
Existing parsers
88+
-----------------
89+
90+
Several default parsers are available in Geotrek.
91+
They are more or less generic scripts designed to save time when creating data mappings.
92+
Below is the list of these scripts for each touristic information system:
93+
94+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
95+
| | Apidae | Tourinsoft | Cirkwi | Lei | Esprit Parc | Openstreetmap |
96+
+==========================+==========+==============+==========+======+===============+===============+
97+
| Touristic content | x | x | x | x | x | x |
98+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
99+
| Touristic event | x | x | | x | | |
100+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
101+
| Information desk | x | | | | | x |
102+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
103+
| Infrastructure | x | | | | | x |
104+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
105+
| Services | x | | | | | |
106+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
107+
| POI | x | | | | | x |
108+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
109+
| Trek * | x | | x | | | |
110+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
111+
| District | | | | | | x |
112+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
113+
| City | | | | | | x |
114+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
115+
| Restricted area | | | | | | x |
116+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
117+
| Signage | | | | | | x |
118+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
119+
| Outdoor site | | | | | | x |
120+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
121+
122+
\* Geometry is only available without dynamic segmentation.
123+
It is not possible to import geometries for treks in a database using dynamic segmentation.
124+
125+
87126
.. _apidae-parsers:
88127

89128
APIDAE

‎docs/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ typing-extensions==4.15.0
113113
# typing-inspection
114114
typing-inspection==0.4.2
115115
# via pydantic
116-
urllib3==2.5.0
116+
urllib3==2.6.2
117117
# via
118118
# -c ../requirements.txt
119119
# requests

0 commit comments

Comments
 (0)