# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1574761206 -3600
# Node ID a5ac0ef9b40ba7d580bf186994960c512e444406
# Parent  c8b8b126bb32fc2998a7979061298f74b080233d# Parent  5e388170da4fd0fd6836a1f5c652e03adbdda259
Merge !!

diff -r 5e388170da4f -r a5ac0ef9b40b .gitlab-ci.yml
--- a/.gitlab-ci.yml	Tue Nov 26 09:32:36 2019 +0100
+++ b/.gitlab-ci.yml	Tue Nov 26 10:40:06 2019 +0100
@@ -54,17 +54,32 @@
     stage: quality
     allow_failure: true
     image: docker:stable
+    services:
+        - docker:stable-dind
     variables:
         DOCKER_DRIVER: overlay2
-    services:
-        - docker:stable-dind
+        DOCKER_TLS_CERTDIR: ""
     script:
-        - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+        - |
+            if ! docker info &>/dev/null; then
+              if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
+                export DOCKER_HOST='tcp://localhost:2375'
+              fi
+            fi
         - docker run
             --env SOURCE_CODE="$PWD"
             --volume "$PWD":/code
             --volume /var/run/docker.sock:/var/run/docker.sock
-            "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+            "registry.gitlab.com/gitlab-org/security-products/codequality:12-0-stable" /code
     artifacts:
         reports:
             codequality: gl-code-quality-report.json
+        expire_in: 1 week
+    dependencies: []
+    only:
+        refs:
+            - branches
+            - tags
+    except:
+        variables:
+            - $CODE_QUALITY_DISABLED
diff -r 5e388170da4f -r a5ac0ef9b40b buildout.cfg
--- a/buildout.cfg	Tue Nov 26 09:32:36 2019 +0100
+++ b/buildout.cfg	Tue Nov 26 10:40:06 2019 +0100
@@ -5,7 +5,7 @@
 socket-timeout = 3
 
 versions = versions
-#allow-picked-versions = false
+allow-picked-versions = false
 show-picked-versions = true
 newest = false
 
diff -r 5e388170da4f -r a5ac0ef9b40b docs/README.txt
--- a/docs/README.txt	Tue Nov 26 09:32:36 2019 +0100
+++ b/docs/README.txt	Tue Nov 26 10:40:06 2019 +0100
@@ -1,14 +1,25 @@
 ===================
-pyams_utils package
+PyAMS_utils package
 ===================
 
 .. contents::
 
 
-What is pyams_utils ?
+What is PyAMS
+=============
+
+PyAMS (Pyramid Application Management Suite) is a small suite of packages written for applications
+and content management with the Pyramid framework.
+
+**PyAMS** is actually mainly used to manage web sites through content management applications (CMS,
+see PyAMS_content package), but many features are generic and can be used inside any kind of web
+application.
+
+
+What is PyAMS_utils ?
 =====================
 
-pyams_utils is a set of classes and functions which can be used to provide many small services and
+PyAMS_utils is a set of classes and functions which can be used to provide many small services and
 handle common operations in the context of a Pyramid application.
 
 Internal sub-packages include:
@@ -30,7 +41,4 @@
 How to use pyams_utils ?
 ========================
 
-A set of pyams_utils usages are given as doctests in pyams_utils/doctests/README.txt
-
-You will also a whole set of documentations into the "docs" directory, available on
-`ReadTheDocs <http://pyams-utils.readthedocs.org>`_
+A whole set of PyAMS documentation is available on `ReadTheDocs <https://pyams.readthedocs.io>`_
diff -r 5e388170da4f -r a5ac0ef9b40b tox.ini
--- a/tox.ini	Tue Nov 26 09:32:36 2019 +0100
+++ b/tox.ini	Tue Nov 26 10:40:06 2019 +0100
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py34, py35, py36, pypy
+envlist = py35, py36, py37, pypy
 
 [testenv]
 commands = python setup.py test