Merge branch 'release/2.6.2'

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.6.1
+current_version = 2.6.2
 tag_name = {new_version}
 commit = True
 tag = True

.gitchangelog.rc

@@ -5,7 +5,7 @@
 ##
 ## Description
 ##
-##   ACTION is one of '[REF]', '[FIX]', '[ADD]'
+##   ACTION is one of '[REF]', '[FIX]', '[ADD]', '[DEL]'
 ##
 ##       Is WHAT the change is about.
 ##
@@ -41,6 +41,17 @@
 ignore_regexps = [
     r'^(.{3,3}\s*:)?\s*[Uu]pdating [Cc]hangelog and [Vv]ersion.?\s*$',
     r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
+    r'@minor', r'!minor',
+    r'@cosmetic', r'!cosmetic',
+    r'@refactor', r'!refactor',
+    r'@wip', r'!wip',
+    r'^[Cc][Ii]\s*:',  ## ignore Ci-related commits
+    r'^.*:\s*[Cc][Ii]\s*:',  ## ignore Ci-related commits
+    r'^.*[Cc]ircle[Cc][Ii]\s*',  ## ignore Ci-related commits
+    r'^.*:github:.*$',
+    r'^.*:changelog:.*$',
+    r'^Git-svn-id',
+    r'^$',  ## ignore commits with empty messages
 ]
 
 
@@ -57,9 +68,10 @@ ignore_regexps = [
 ## whenever you are tweaking this variable.
 ##
 section_regexps = [
-    ('New', [r'^\[ADD\]\s*([^\n]*)$']),
-    ('Changes', [r'^\[REF\]\s*([^\n]*)$']),
-    ('Fix', [r'^\[FIX\]\s*([^\n]*)$']),
+    ('Added', [r'^\[ADD\]\s*([^\n]*)$']),
+    ('Changed', [r'^\[REF\]\s*([^\n]*)$']),
+    ('Fixed', [r'^\[FIX\]\s*([^\n]*)$']),
+    ('Removed', [r'^\[DEL\]\s*([^\n]*)$']),
     ('Other', None),
 ]
 
@@ -120,7 +132,7 @@ tag_filter_regexp = r'^[0-9]+\.[0-9]+(\.[0-9]+)?$'
 ##
 ## This label will be used as the changelog Title of the last set of changes
 ## between last valid tag and HEAD if any.
-unreleased_version_label = "%%version%% (unreleased)"
+unreleased_version_label = "(unreleased)"
 
 
 ## ``output_engine`` is a callable
@@ -153,8 +165,8 @@ unreleased_version_label = "%%version%% (unreleased)"
 ##
 #output_engine = rest_py
 #output_engine = mustache("restructuredtext")
-output_engine = mustache("markdown")
-#output_engine = makotemplate("restructuredtext")
+#output_engine = mustache("markdown")
+output_engine = makotemplate(".gitchangelog.tpl")
 
 
 ## ``include_merge`` is a boolean

.github/dependabot.yml

@@ -4,6 +4,7 @@ updates:
   directory: "/"
   schedule:
     interval: weekly
+    day: thursday
     time: "01:00"
   ignore:
   - dependency-name: setuptools
@@ -20,5 +21,6 @@ updates:
   directory: "/"
   schedule:
     interval: weekly
+    day: thursday
     time: "01:00"
   open-pull-requests-limit: 99

.github/workflows/code-quality.yml

@@ -2,7 +2,7 @@ name: Code Quality
 
 on:
   schedule:
-    - cron: '00 3 * * 1'
+    - cron: '00 3 * * 4'
 
 jobs:
   build:

.github/workflows/pr.yml

@@ -61,23 +61,23 @@ jobs:
     needs: approve
     steps:
       - name: Merge
-        uses: actions/github-script@v4.1
+        uses: actions/github-script@v5
         if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
         with:
           github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
           script: |
-            await github.pulls.merge({
+            await github.rest.pulls.merge({
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: context.payload.pull_request.number
             })
       - name: Merge
-        uses: actions/github-script@v4.1
+        uses: actions/github-script@v5
         if: github.actor == 'LuisAlejandro'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           script: |
-            await github.pulls.merge({
+            await github.rest.pulls.merge({
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: context.payload.pull_request.number

.github/workflows/push-develop.yml

@@ -37,7 +37,6 @@ jobs:
             docker-image-extra-tags: "dockershelf/python:latest"
           - docker-image-name: "dockershelf/ruby:2.1"
           - docker-image-name: "dockershelf/ruby:2.3"
-          - docker-image-name: "dockershelf/ruby:2.5"
           - docker-image-name: "dockershelf/ruby:2.7"
           - docker-image-name: "dockershelf/ruby:3.0"
             docker-image-extra-tags: "dockershelf/ruby:latest"
@@ -46,6 +45,7 @@ jobs:
           - docker-image-name: "dockershelf/node:14"
           - docker-image-name: "dockershelf/node:15"
           - docker-image-name: "dockershelf/node:16"
+          - docker-image-name: "dockershelf/node:17"
             docker-image-extra-tags: "dockershelf/node:latest"
           - docker-image-name: "dockershelf/mongo:4.2"
           - docker-image-name: "dockershelf/mongo:4.4"

.github/workflows/push-master.yml

@@ -37,7 +37,6 @@ jobs:
             docker-image-extra-tags: "dockershelf/python:latest"
           - docker-image-name: "dockershelf/ruby:2.1"
           - docker-image-name: "dockershelf/ruby:2.3"
-          - docker-image-name: "dockershelf/ruby:2.5"
           - docker-image-name: "dockershelf/ruby:2.7"
           - docker-image-name: "dockershelf/ruby:3.0"
             docker-image-extra-tags: "dockershelf/ruby:latest"
@@ -46,6 +45,7 @@ jobs:
           - docker-image-name: "dockershelf/node:14"
           - docker-image-name: "dockershelf/node:15"
           - docker-image-name: "dockershelf/node:16"
+          - docker-image-name: "dockershelf/node:17"
             docker-image-extra-tags: "dockershelf/node:latest"
           - docker-image-name: "dockershelf/mongo:4.2"
           - docker-image-name: "dockershelf/mongo:4.4"

.github/workflows/schedule-master.yml

@@ -2,7 +2,7 @@ name: Schedule (master branch)
 
 on:
   schedule:
-    - cron: '00 3 * * 1'
+    - cron: '00 3 * * 4'
 
 jobs:
   build:
@@ -36,7 +36,6 @@ jobs:
             docker-image-extra-tags: "dockershelf/python:latest"
           - docker-image-name: "dockershelf/ruby:2.1"
           - docker-image-name: "dockershelf/ruby:2.3"
-          - docker-image-name: "dockershelf/ruby:2.5"
           - docker-image-name: "dockershelf/ruby:2.7"
           - docker-image-name: "dockershelf/ruby:3.0"
             docker-image-extra-tags: "dockershelf/ruby:latest"
@@ -45,6 +44,7 @@ jobs:
           - docker-image-name: "dockershelf/node:14"
           - docker-image-name: "dockershelf/node:15"
           - docker-image-name: "dockershelf/node:16"
+          - docker-image-name: "dockershelf/node:17"
             docker-image-extra-tags: "dockershelf/node:latest"
           - docker-image-name: "dockershelf/mongo:4.2"
           - docker-image-name: "dockershelf/mongo:4.4"

.github/workflows/schedule-master.yml.template

@@ -2,7 +2,7 @@ name: Schedule (master branch)
 
 on:
   schedule:
-    - cron: '00 3 * * 1'
+    - cron: '00 3 * * 4'
 
 jobs:
   build: