f

.github/workflows/main.yaml

@@ -21,6 +21,8 @@ jobs:
       - run: docker system prune --all --force
 
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - uses: camptocamp/initialise-gopass-summon-action@v2
         with:
@@ -147,8 +149,8 @@ jobs:
       - run: ci/test-upgrade cleanup ${HOME}/workspace
 
       - name: Init Git
-        run: |
-            git remote set-url origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        run: git remote set-url origin
+          https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
       - run: make build-tools
       - run: make build-runner
       - run: make build-config

ci/project-config.yaml

@@ -0,0 +1,4 @@
+---
+checks:
+  required_workflows: False
+  versions: False

ci/test-app

@@ -5,11 +5,13 @@ rm -rf ${HOME}/workspace/testgeomapfishapp
 ci/create-new-project ${HOME}/workspace
 cp ci/docker-compose.override.yaml ${HOME}/workspace/testgeomapfishapp/
 cp ci/empty.qgz ${HOME}/workspace/testgeomapfishapp/qgisserver/project.qgz
+PROJECT_DIR=$(pwd)
 docker build --tag=camptocamp/geomapfish-test-app-db docker/test-app-db
 docker build --tag=camptocamp/geomapfish-test-external-db docker/test-external-db
 
 cd ${HOME}/workspace/testgeomapfishapp/
-rm ci/config.yaml
+c2cciutils-checks
+cp ${PROJECT_DIR}/ci/project-config.yaml ci/config.yaml
 c2cciutils-checks
 ./build
 docker-compose down

geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+editorconfig

@@ -7,6 +7,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+max_line_length = 110
+quote_type = single
 
 [*.js]
 indent_size = 2

geoportal/c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/__init__.py_tmpl

@@ -3,11 +3,11 @@
 import distutils.core
 
 from pyramid.config import Configurator
-from {{package}}_geoportal.resources import Root
 
 from c2cgeoportal_geoportal import INTERFACE_TYPE_NGEO, add_interface, locale_negotiator
 from c2cgeoportal_geoportal.lib.authentication import create_authentication
 from c2cgeoportal_geoportal.lib.i18n import LOCALE_PATH
+from {{package}}_geoportal.resources import Root
 
 
 def main(global_config, **settings):

geoportal/c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/models.py_tmpl

@@ -6,5 +6,6 @@ from pyramid.i18n import TranslationStringFactory
 
 from c2cgeoportal_commons.models.main import *  # noqa
 
+
 _ = TranslationStringFactory("{{package}}_geoportal-server")
 LOG = logging.getLogger(__name__)

geoportal/c2cgeoportal_geoportal/scaffolds/create/pyproject.toml

@@ -0,0 +1,3 @@
+[tool.black]
+line-length = 110
+target-version = ['py38']

geoportal/c2cgeoportal_geoportal/scaffolds/create/setup.cfg_tmpl

@@ -0,0 +1,7 @@
+[isort]
+known_first_party=c2cgeoportal_commons,c2cgeoportal_geoportal,c2cgeoportal_admin,{{package}}_geoportal
+multi_line_output=3
+include_trailing_comma=1
+force_grid_wrap=0
+use_parentheses=1
+line_length=110

pyproject.toml

@@ -1,4 +1,3 @@
-
 [tool.black]
 line-length = 110
 target-version = ['py38']

setup.cfg

@@ -14,7 +14,7 @@ disallow_untyped_defs = True
 
 [isort]
 known_third_party=c2cwsgiutils,c2cgeoform
-known_first_party=c2cgeoportal_commons,c2cgeoportal_geoportal,c2cgeoportal_admin
+known_first_party=c2cgeoportal_commons,c2cgeoportal_geoportal,c2cgeoportal_admin,{{package}}_geoportal
 multi_line_output=3
 include_trailing_comma=1
 force_grid_wrap=0