Skip to content

Commit f39edcb

Browse files
authored
Merge pull request #2763 from camptocamp/interrupted-upgrade-prod-2-10-advance-master
Upgrade failed
2 parents f79e406 + c767b85 commit f39edcb

24 files changed

Lines changed: 5 additions & 493 deletions
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
c2cciutils[checks]==1.7.5
2-
pre-commit==4.6.1
2+
pre-commit==4.6.2
33
tag-publish==1.2.2

CONST_create_template/geoportal/geomapfish_geoportal/__init__.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
241
from pyramid.config import Configurator
252

263
import geomapfish_geoportal.authentication

CONST_create_template/geoportal/geomapfish_geoportal/authentication.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
241
from c2cgeoportal_geoportal.lib.authentication import create_authentication
252
from pyramid.authorization import ACLAuthorizationPolicy
263
from pyramid.config import Configurator

CONST_create_template/geoportal/geomapfish_geoportal/dev.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
241
from pyramid.config import Configurator
252

263

CONST_create_template/geoportal/geomapfish_geoportal/models.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
241
import logging
252

263
from c2cgeoportal_commons.models.main import * # pylint: disable=unused-wildcard-import # noqa: F403

CONST_create_template/geoportal/geomapfish_geoportal/multi_tenant.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
241
from pyramid.config import Configurator
252

263

CONST_create_template/geoportal/geomapfish_geoportal/resources.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
241
import pyramid.request
252
from pyramid.security import ALL_PERMISSIONS, Allow
263

CONST_create_template/geoportal/geomapfish_geoportal/subscribers.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
241
from pyramid.events import BeforeRender, NewRequest, subscriber
252
from pyramid.i18n import TranslationStringFactory, get_localizer
263

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +0,0 @@
1-
# Copyright (c) 2025-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

CONST_create_template/geoportal/gunicorn.conf.py

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,3 @@
1-
# Copyright (c) 2019-2026, Camptocamp SA
2-
# All rights reserved.
3-
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are met:
6-
7-
# 1. Redistributions of source code must retain the above copyright notice, this
8-
# list of conditions and the following disclaimer.
9-
# 2. Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
12-
13-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17-
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23-
24-
# The views and conclusions contained in the software and documentation are those
25-
# of the authors and should not be interpreted as representing official policies,
26-
# either expressed or implied, of the FreeBSD Project.
27-
281
###
292
# app configuration
303
# https://docs.gunicorn.org/en/stable/settings.html

0 commit comments

Comments
 (0)