c2cgeoportal-geoportal 2.7.1.156__py2.py3-none-any.whl → 2.8.1.180__py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (97) hide show
  1. c2cgeoportal_geoportal/__init__.py +24 -14
  2. c2cgeoportal_geoportal/lib/authentication.py +10 -14
  3. c2cgeoportal_geoportal/lib/caching.py +8 -6
  4. c2cgeoportal_geoportal/lib/checker.py +10 -6
  5. c2cgeoportal_geoportal/lib/common_headers.py +5 -8
  6. c2cgeoportal_geoportal/lib/dbreflection.py +8 -8
  7. c2cgeoportal_geoportal/lib/filter_capabilities.py +5 -1
  8. c2cgeoportal_geoportal/lib/lingua_extractor.py +11 -12
  9. c2cgeoportal_geoportal/lib/loader.py +1 -1
  10. c2cgeoportal_geoportal/lib/oauth2.py +217 -100
  11. c2cgeoportal_geoportal/lib/wmstparsing.py +8 -12
  12. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/Dockerfile +9 -11
  13. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/development.ini +1 -1
  14. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/gunicorn.conf.py +0 -2
  15. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/requirements.txt +1 -1
  16. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.api.js +6 -4
  17. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.apps.js +1 -3
  18. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.commons.js +1 -0
  19. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/__init__.py +1 -6
  20. c2cgeoportal_geoportal/scaffolds/advance_update/{{cookiecutter.project}}/geoportal/CONST_Makefile +0 -20
  21. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml +20 -6
  22. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/update_l10n.yaml +4 -3
  23. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile +22 -22
  24. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile +58 -2
  25. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build +48 -24
  26. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml +2 -5
  27. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/docker-compose-check +25 -0
  28. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt +1 -1
  29. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml +26 -0
  30. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml +53 -26
  31. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml +23 -0
  32. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml +0 -1
  33. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml +3 -3
  34. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default +21 -2
  35. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project +9 -0
  36. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml +38 -14
  37. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/data/Readme.txt +2 -2
  38. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.conf +15 -0
  39. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.map.tmpl +2 -3
  40. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A3_Landscape.jrxml +5 -0
  41. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A3_Portrait.jrxml +5 -0
  42. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A4_Landscape.jrxml +5 -0
  43. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A4_Portrait.jrxml +5 -0
  44. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/config.yaml.tmpl +6 -0
  45. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/pyproject.toml +4 -0
  46. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/run_alembic.sh +3 -5
  47. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup +1 -1
  48. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore +1 -1
  49. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/spell-ignore-words.txt +2 -0
  50. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/__init__.py +0 -0
  51. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.py +38 -0
  52. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml +2 -132
  53. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt +210 -1097
  54. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py +48 -0
  55. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_config-schema.yaml +17 -15
  56. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml +46 -2
  57. c2cgeoportal_geoportal/scripts/c2cupgrade.py +1 -2
  58. c2cgeoportal_geoportal/scripts/pcreate.py +8 -10
  59. c2cgeoportal_geoportal/scripts/theme2fts.py +58 -3
  60. c2cgeoportal_geoportal/views/__init__.py +1 -3
  61. c2cgeoportal_geoportal/views/dynamic.py +1 -1
  62. c2cgeoportal_geoportal/views/entry.py +2 -10
  63. c2cgeoportal_geoportal/views/fulltextsearch.py +1 -1
  64. c2cgeoportal_geoportal/views/geometry_processing.py +3 -3
  65. c2cgeoportal_geoportal/views/layers.py +10 -11
  66. c2cgeoportal_geoportal/views/login.py +63 -8
  67. c2cgeoportal_geoportal/views/mapserverproxy.py +2 -3
  68. c2cgeoportal_geoportal/views/ogcproxy.py +6 -2
  69. c2cgeoportal_geoportal/views/pdfreport.py +4 -4
  70. c2cgeoportal_geoportal/views/printproxy.py +2 -2
  71. c2cgeoportal_geoportal/views/profile.py +1 -1
  72. c2cgeoportal_geoportal/views/proxy.py +2 -4
  73. c2cgeoportal_geoportal/views/raster.py +2 -2
  74. c2cgeoportal_geoportal/views/resourceproxy.py +1 -1
  75. c2cgeoportal_geoportal/views/shortener.py +1 -2
  76. c2cgeoportal_geoportal/views/theme.py +97 -63
  77. c2cgeoportal_geoportal/views/tinyowsproxy.py +3 -12
  78. c2cgeoportal_geoportal/views/vector_tiles.py +1 -1
  79. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/METADATA +21 -15
  80. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/RECORD +96 -90
  81. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/entry_points.txt +1 -0
  82. tests/__init__.py +3 -2
  83. tests/test_cachebuster.py +3 -3
  84. tests/test_caching.py +7 -7
  85. tests/test_checker.py +1 -1
  86. tests/test_decimaljson.py +1 -1
  87. tests/test_headerstween.py +1 -1
  88. tests/test_i18n.py +1 -1
  89. tests/test_init.py +14 -15
  90. tests/test_locale_negociator.py +4 -4
  91. tests/test_mapserverproxy_route_predicate.py +1 -2
  92. tests/test_raster.py +15 -15
  93. tests/test_wmstparsing.py +10 -10
  94. tests/xmlstr.py +1 -3
  95. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/tools/extract-messages.js +0 -41
  96. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/WHEEL +0 -0
  97. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/top_level.txt +0 -0
@@ -95,7 +95,7 @@ def main() -> None:
95
95
  *(["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]),
96
96
  "exec",
97
97
  "-T",
98
- "db",
98
+ "tools",
99
99
  "bash",
100
100
  "-c",
101
101
  'pg_dump --format=c --dbname="$PGDATABASE"',
@@ -100,7 +100,7 @@ def main() -> None:
100
100
  *("--file={}".format(f) for f in args.docker_compose_file),
101
101
  "exec",
102
102
  "-T",
103
- "db",
103
+ "tools",
104
104
  "bash",
105
105
  "-c",
106
106
  'pg_restore --dbname="$PGDATABASE" ' + " ".join(args.arg),
@@ -0,0 +1,38 @@
1
+ from typing import Dict
2
+
3
+ import pytest
4
+ import requests
5
+
6
+
7
+ @pytest.mark.parametrize(
8
+ "url,params,timeout",
9
+ [
10
+ ("https://front", {}, 10),
11
+ ("https://front/themes", {}, 120),
12
+ ("https://front/static-geomapfish/0/locales/fr.json", {}, 2),
13
+ ("https://front/dynamic.json", {"interface": "desktop"}, 10),
14
+ ("https://front/dynamic.json", {"interface": "desktop", "query": "", "path": "/"}, 10),
15
+ ("https://front/c2c/health_check", {}, 2),
16
+ ("https://front/c2c/health_check", {"max_level": "1"}, 2),
17
+ ("https://front/c2c/health_check", {"checker": "check_collector"}, 2),
18
+ ("https://front/admin/layertree", {}, 10),
19
+ ("https://front/admin/layertree/children", {}, 10),
20
+ ("http://mapserver:8080/mapserv_proxy", {"SERVICE": "WMS", "REQUEST": "GetCapabilities"}, 60),
21
+ (
22
+ "https://front/mapserv_proxy",
23
+ {"ogcserver": "source for image/png", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
24
+ 60,
25
+ ),
26
+ ],
27
+ )
28
+ def test_url(url: str, params: Dict[str, str], timeout: int) -> None:
29
+ """Tests that some URL didn't return an error."""
30
+ response = requests.get(url, params=params, verify=False, timeout=timeout) # nosec
31
+ assert response.status_code == 200, response.text
32
+
33
+
34
+ def test_admin() -> None:
35
+ """Tests that the admin page will provide the login page."""
36
+ response = requests.get("https://front/admin/", verify=False, timeout=30) # nosec
37
+ assert response.status_code == 200, response.text
38
+ assert "Login" in response.text
@@ -44,6 +44,7 @@ extra:
44
44
  - geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/js/apps/sass/vars_oeedit\.scss
45
45
  - geoportal/interfaces/desktop_alt\.html\.mako
46
46
  - geoportal/{{cookiecutter.package}}_geoportal/static/images/background-layer-button\.png
47
+ - tests/test_testapp.py
47
48
 
48
49
  # Automated file system operations:
49
50
  # Remove some files or directories:
@@ -57,135 +58,4 @@ extra:
57
58
  upgrade_files:
58
59
  - action: remove
59
60
  paths:
60
- - docker-run
61
- - .config
62
- - docker-compose-run
63
- - docker-compose-build.yaml
64
- - geoportal/jsbuild/
65
- - geoportal/{package}_geoportal/templates/api/
66
- - geoportal/{package}_geoportal/static/lib/.gitignore
67
- - testdb/
68
- - vars_convert2tmpl.yaml
69
- - CONST_convert2tmpl.mk
70
- - CONST_config-schema.yaml
71
- - CONST_Makefile
72
- - CONST_vars.yaml
73
- - project.yaml.mako
74
- - geoportal/{{cookiecutter.package}}_geoportal/static/apihelp/images
75
- - action: move
76
- from: .eslintrc
77
- to: geoportal/.eslintrc
78
- - action: move
79
- from: language_mapping
80
- to: geoportal/language_mapping
81
- - action: move
82
- from: lingua-client.cfg
83
- to: geoportal/lingua-client.cfg
84
- - action: move
85
- from: lingua-server.cfg
86
- to: geoportal/lingua-server.cfg
87
- - action: move
88
- from: vars.yaml
89
- to: geoportal/vars.yaml
90
- - action: move
91
- from: geoportal/webpack.apps.js.mako
92
- to: geoportal/webpack.apps.js
93
- - action: move
94
- from: geoportal/Dockerfile.mako
95
- to: geoportal/Dockerfile
96
- - action: move
97
- from: geoportal/development.ini.mako
98
- to: geoportal/development.ini
99
- - action: move
100
- from: geoportal/production.ini.mako
101
- to: geoportal/production.ini
102
- - action: move
103
- from: .env.mako
104
- to: .env.sample
105
- - action: move
106
- from: Dockerfile.mako
107
- to: Dockerfile
108
- - action: move
109
- from: tools/extract-messages.js
110
- to: geoportal/tools/extract-messages.js
111
- - action: move
112
- from: scripts/deploy-docker
113
- to: scripts/publish-docker
114
- - action: move
115
- from: geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/apihelp/index.html
116
- to: geoportal/{{cookiecutter.package}}_geoportal/static/apihelp/index.html
117
- - action: move
118
- from: geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/apihelp/rainbow-custom.min.js
119
- to: geoportal/{{cookiecutter.package}}_geoportal/static/apihelp/rainbow-custom.min.js
120
- - action: move
121
- from: geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/apihelp/github.css
122
- to: geoportal/{{cookiecutter.package}}_geoportal/static/apihelp/github.css
123
- - action: move
124
- from: geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/apihelp/data.txt
125
- to: geoportal/{{cookiecutter.package}}_geoportal/static/apihelp/data.txt
126
- - action: move
127
- from: geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/apihelp/img
128
- to: geoportal/{{cookiecutter.package}}_geoportal/static/apihelp/img
129
- - action: remove
130
- paths:
131
- - geoportal/{{cookiecutter.package}}_geoportal/static/apihelp/track0.gpx
132
- - geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/apihelp/
133
- - action: remove
134
- paths:
135
- - geoportal/{{cookiecutter.package}}_geoportal/static/css/proj.css
136
- - geoportal/{{cookiecutter.package}}_geoportal/static/css/proj-map.css
137
- - geoportal/{{cookiecutter.package}}_geoportal/static/css/proj-widgets.css
138
- - geoportal/{{cookiecutter.package}}_geoportal/static/js/
139
- - action: remove
140
- paths:
141
- - scripts/CONST_clone_schema.sql
142
- - action: remove
143
- paths:
144
- - front
145
- - front_dev
146
- - bin/entrypoint
147
- - bin/eval-templates
148
- - action: move
149
- from: .env.sample
150
- to: env.sample
151
- - action: remove
152
- paths:
153
- - cgxp_revision
154
- - action: remove
155
- paths:
156
- - .circleci/config.yml
157
- - .travis.yml
158
- - action: move
159
- from: env.sample
160
- to: env.default
161
- - action: remove
162
- paths:
163
- - mapserver/CONST_example_map
164
- - action: remove
165
- paths:
166
- - geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/js/apps/image/crosshair.svg
167
- - action: move
168
- from: geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/js/apps/image/favicon.ico
169
- to: geoportal/{{cookiecutter.package}}_geoportal/static/images/favicon.ico
170
- override: True
171
- - action: move
172
- from: .github/workflows/ci.yaml
173
- to: .github/workflows/main.yaml
174
- - action: remove
175
- paths:
176
- - scripts/publish-docker
177
- - action: remove
178
- paths:
179
- - geoportal/{{cookiecutter.package}}_geoportal/locale/.emptyfolder
180
- - action: move
181
- from: geoportal/.eslintrc
182
- to: geoportal/.eslintrc.yaml
183
- - action: remove
184
- paths:
185
- - qgisserver/geomapfish.yaml.tmpl
186
- - action: remove
187
- paths:
188
- - ci/trigger
189
- - action: remove
190
- paths:
191
- - yamllint.yaml
61
+ - geoportal/tools/extract-messages.js