merge 3.30 into 3.31

--HG--
branch : 3.31

.gitlab-ci.yml

@@ -23,6 +23,7 @@ flake8:
       when: never
     - changes:
         - "**/*.py"
+        - "*.py"
   stage: lint
   before_script:
     - pip install tox
@@ -168,7 +169,8 @@ test-cube-skeleton:
     - tox
     - '[ "$(hg status | wc -l)" = 0 ]'
 
-py3-from-forge-server:
+.py3-from-forge-server:
+  interruptible: true
   rules:
     - changes:
         - cubicweb/**/*
@@ -187,11 +189,14 @@ py3-from-forge-server:
     paths:
       - /builds/cubicweb/cubicweb/from-forge-server.html
       - /builds/cubicweb/cubicweb/py3-from-forge-server-deprecated-warnings.json
+    reports:
+      junit: /builds/cubicweb/cubicweb/from-forge-server.xml
     expire_in: 2 weeks
   script:
     - tox -e py3-from-forge-server
 
-py3-from-forge-web:
+.py3-from-forge-web:
+  interruptible: true
   rules:
     - changes:
         - cubicweb/**/*
@@ -211,9 +216,12 @@ py3-from-forge-web:
     paths:
       - /builds/cubicweb/cubicweb/from-forge-web.html
       - /builds/cubicweb/cubicweb/py3-from-forge-web-deprecated-warnings.json
+    reports:
+      junit: /builds/cubicweb/cubicweb/from-forge-web.xml
     expire_in: 2 weeks
 
-py3-from-forge-misc:
+.py3-from-forge-misc:
+  interruptible: true
   rules:
     - changes:
         - cubicweb/**/*
@@ -233,6 +241,8 @@ py3-from-forge-misc:
     paths:
       - /builds/cubicweb/cubicweb/from-forge-misc.html
       - /builds/cubicweb/cubicweb/py3-from-forge-misc-deprecated-warnings.json
+    reports:
+      junit: /builds/cubicweb/cubicweb/from-forge-misc.xml
     expire_in: 2 weeks
 
 trigger-readthedocs:

.hgtags

@@ -688,6 +688,7 @@ f5768f140cde2e522be7c14ec180e87865890743 3.29.3
 2052a708e92d598936cc84b8eb1030281283d2fc 3.29.4
 df3bf737b60e189bfa8e1e365157e8c36bc50ba3 3.29.5
 bedf6cb540ca4dd0b099ce3c6b00e1202d48168a 3.30.0
+dd445014650dd2c2b6f2561dd13799be7bcd69f1 3.30.1
 f0007241c4773160b6c2b93a0b56a9617a74389c 3.31.1
 e106c287f71a1f49e681214a20ee26e81f695043 3.31.2
 ef46f909341c31472545c693e63d4ad79a3087da 3.31.3

debian/changelog

@@ -22,6 +22,12 @@ cubicweb (3.31.0-1) unstable; urgency=medium
 
  -- François Ferry <francois.ferry@logilab.fr>  Tue, 04 May 2021 17:24:13 +0200
 
+cubicweb (3.30.1-1) unstable; urgency=medium
+
+  * New patch release
+
+ -- François Ferry <francois.ferry@logilab.fr>  Fri, 23 Jul 2021 17:45:40 +0200
+
 cubicweb (3.30.0-1) unstable; urgency=medium
 
   * New minor release

doc/changes/3.30.rst

-3.30 (2021-03-16)
-=================
+3.30.1 (2021-07-23)
+===================
+👷 Bug fixes
+-----------
+
+- pin rdflib < 6.0.0 to avoid compatibility issues
+
+🤖 Continuous integration
+------------------------
+
+- use image from heptapod registry since r.intra was shut down
+
+3.30.0 (2021-03-16)
+===================
 
 New features
 ------------