Upgrade to c2cgeoportal 2.3 (step 1)

Views, js, ... are not overwritten yet

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.js]
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.gitignore

@@ -1,34 +1,23 @@
+*~
 *.pyc
-*.po~
-/apache/README.txt
-/apache/frontend.conf
-/apache/mapserver.conf
-/apache/wsgi.conf
-/apache/application.wsgi
-/deploy/deploy.cfg
-/alembic.ini
-/alembic_static.ini
-/lux_alembic.ini
-/development.ini
-/production.ini
-/project.yaml
-/*.egg-info/
-/print/WEB-INF/classes/logback.xml
-/geoportailv3/locale/*/LC_MESSAGES/*.mo
-/geoportailv3/locale/*/LC_MESSAGES/*-client.po
-/geoportailv3/locale/*/LC_MESSAGES/*-client-tooltips.po
-/geoportailv3/static/mobile/
-#/geoportailv3/static/mobile/resources/sass/.sass-cache
-#/geoportailv3/static/mobile/resources/css/app.css
-#/geoportailv3/static/mobile/archive/
-#/geoportailv3/static/mobile/build/
-#/geoportailv3/static/mobile/openlayers-mobile.js
-#/geoportailv3/static/mobile/bootstrap.js
-#/geoportailv3/static/mobile/bootstrap.json
-/geoportailv3/static/build
-/geoportailv3/locale/*.pot
-/.eggs
-/.build
-/package-lock.json
-/node_modules
-vars_wepa.yaml
+*.pyo
+__pycache__/
+/.env
+/geoportal/.venv/
+/geoportal/dist/
+/geoportal/build/
+/geoportal/geoportailv3_geoportal/static-ngeo/build/
+/geoportal/geoportailv3_geoportal.egg-info/
+/geoportal/geoportailv3_geoportal/locale/*/LC_MESSAGES/*.mo
+/geoportal/c2cgeoportal/
+/geoportal/node_modules/
+/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-client.pot
+/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-server.pot
+/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-tooltips.pot
+/geoportal/geoportailv3_geoportal/locale/ngeo.pot
+/.build/
+/node_modules/
+/geoportailv3/
+/apache/
+/print/WEB-INF/
+/geoportailv3.egg-info/

.travis.yml

@@ -1,39 +1,12 @@
-language: python
-
-dist: trusty
-
-python:
-- 2.7
+---
 
 sudo: false
+
 addons:
-  postgresql: "9.5"
   apt:
     packages:
-      - postgresql-9.5-postgis-2.3
-
-install:
-- createdb -E UTF8 -T template0 template_postgis -U postgres
-- psql -d template_postgis -c "CREATE EXTENSION postgis;" -U postgres
-- createdb -E UTF8 -T template_postgis lux -U postgres
-- createuser www-data --no-superuser --no-createdb --no-createrole -U postgres
-- psql -d lux -c 'CREATE SCHEMA geov3;' -U postgres
-- psql -d lux -c 'CREATE SCHEMA geov3_static;' -U postgres
-- psql -d lux -c 'CREATE SCHEMA geov3_stats;' -U postgres
-- psql -d lux -c "ALTER USER \"www-data\" PASSWORD 'www-data';" -U postgres
-- psql -d lux -c 'GRANT SELECT ON spatial_ref_sys TO "www-data";' -U postgres
-- psql -d lux -c 'GRANT ALL ON SCHEMA geov3 TO "www-data";' -U postgres
-- psql -d lux -c 'GRANT ALL ON SCHEMA geov3_static TO "www-data";' -U postgres
-- psql -d lux -c 'GRANT ALL ON SCHEMA geov3_stats TO "www-data";' -U postgres
-- psql -d lux -c 'GRANT ALL ON geometry_columns TO "www-data";' -U postgres
-
-- make -f travis.mk .build/requirements.timestamp || make -f travis.mk .build/requirements.timestamp
-- make -f travis.mk .build/dev-requirements.timestamp || make -f travis.mk .build/dev-requirements.timestamp
-- make -f travis.mk alembic.ini lux_alembic.ini
-- .build/venv/bin/alembic upgrade head
-- .build/venv/bin/alembic -c lux_alembic.ini upgrade head
-- make -f travis.mk .build/build.js || make -f travis.mk .build/build.js
-- make -f travis.mk build
+      - python3-netifaces
 
 script:
-- make -f travis.mk checks
+  - ln -s env-localdev .env
+  - make build

.tx/config

@@ -2,20 +2,25 @@
 host = https://www.transifex.com
 
 [geoportailv3-lu.geoportailv3-client]
-file_filter = geoportailv3/locale/<lang>/LC_MESSAGES/geoportailv3-client.po
-source_file = geoportailv3/locale/geoportailv3-client.pot
+file_filter = geoportal/geoportailv3_geoportal/locale/<lang>/LC_MESSAGES/geoportailv3_geoportal-client.po
+source_file = geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-client.pot
 source_lang = frp
 type = PO
 
 [geoportailv3-lu.geoportailv3-server]
-file_filter = geoportailv3/locale/<lang>/LC_MESSAGES/geoportailv3-server.po
-source_file = geoportailv3/locale/geoportailv3-server.pot
+file_filter = geoportal/geoportailv3_geoportal/locale/<lang>/LC_MESSAGES/geoportailv3_geoportal-server.po
+source_file = geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-server.pot
 source_lang = frp
 type = PO
 
-
 [geoportailv3-lu.geoportailv3-tooltips]
-file_filter = geoportailv3/locale/<lang>/LC_MESSAGES/geoportailv3-tooltips.po
-source_file = geoportailv3/locale/geoportailv3-tooltips.pot
+file_filter = geoportal/geoportailv3_geoportal/locale/<lang>/LC_MESSAGES/geoportailv3_geoportal-tooltips.po
+source_file = geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-tooltips.pot
+source_lang = frp
+type = PO
+
+[ngeo.ngeo-2_3]
+file_filter = geoportal/geoportailv3_geoportal/locale/<lang>/LC_MESSAGES/ngeo.po
+source_file = geoportal/geoportailv3_geoportal/locale/ngeo.pot
 source_lang = frp
 type = PO