Changelog creation fix

travis/changelog

@@ -109,12 +109,14 @@ def add_new_release():
 
 
 def add_commit(commits, all_pulls, repo, ref):
-    if ref not in commits:
+    if ref in commits:
+        return
+    commit = get_commit(repo, ref)
+    if commit['sha'] not in commits:
         pulls = get_pulls(repo, ref)
         for pull in pulls:
             all_pulls[pull['number']] = pull
-        commits[ref] = True
-        commit = get_commit(repo, ref)
+        commits[commit['sha']] = True
         # Get only the first parent to don't go in the pull request
         add_commit(commits, all_pulls, repo, commit['parents'][0]['sha'])
 
@@ -145,7 +147,7 @@ def main():
             )
 
     with open('CHANGELOG.md', 'wt') as md_file:
-        for release, pulls in release_pulls.items():
+        for release, pulls in release_pulls.items()[::-1]:
             md_file.write('##### {}\n'.format(release))
             for repo in REPOS:
                 for pull in pulls[repo].values():

travis/changelog.yaml

@@ -1895,15 +1895,6 @@ pulls:
       state: closed
       title: Update the Docker diagram
       updated_at: '2019-06-06T14:44:13Z'
-    17192d7cc6210391db5a0edc406819db1fce1512:
-    - base_ref: '2.4'
-      closed_at: '2019-09-18T07:26:35Z'
-      created_at: '2019-09-04T15:37:05Z'
-      html_url: https://github.com/camptocamp/c2cgeoportal/pull/5262
-      number: 5262
-      state: closed
-      title: Add view to get translations from Simple API after negociation
-      updated_at: '2019-09-18T14:55:33Z'
     19a3b28661bb938f591fb43e7ce241a2304b0182:
     - base_ref: '2.4'
       closed_at: '2019-06-25T13:47:37Z'
@@ -1940,15 +1931,6 @@ pulls:
       state: closed
       title: Merge remote-tracking branch 'origin/2.4'
       updated_at: '2019-09-19T06:35:05Z'
-    1ce2c928681b3d3b30c03345ba2b8c9da0953353:
-    - base_ref: '2.4'
-      closed_at: '2019-05-16T09:29:07Z'
-      created_at: '2019-05-15T08:44:28Z'
-      html_url: https://github.com/camptocamp/c2cgeoportal/pull/4937
-      number: 4937
-      state: closed
-      title: Use predefined shp2img commond for debugging
-      updated_at: '2019-05-16T09:29:10Z'
     1ef79d1348c24b819342ecbc62d6c55fbaae9d11:
     - base_ref: '2.4'
       closed_at: '2019-06-14T09:42:19Z'
@@ -2102,24 +2084,6 @@ pulls:
       state: closed
       title: 'Merge remote-tracking branch ''origin/2.4'' '
       updated_at: '2019-06-19T20:38:49Z'
-    32df936:
-    - base_ref: '2.4'
-      closed_at: '2019-07-16T15:51:14Z'
-      created_at: '2019-07-16T07:32:26Z'
-      html_url: https://github.com/camptocamp/c2cgeoportal/pull/5156
-      number: 5156
-      state: closed
-      title: Update the databse behavior documentation
-      updated_at: '2019-07-16T15:51:17Z'
-    32df936de826a1a7a6c5a1a6bc06ea50d5717c8a:
-    - base_ref: '2.4'
-      closed_at: '2019-07-16T15:51:14Z'
-      created_at: '2019-07-16T07:32:26Z'
-      html_url: https://github.com/camptocamp/c2cgeoportal/pull/5156
-      number: 5156
-      state: closed
-      title: Update the databse behavior documentation
-      updated_at: '2019-07-16T15:51:17Z'
     34597db:
     - base_ref: '2.4'
       closed_at: '2019-08-05T12:08:48Z'
@@ -4046,3 +4010,9 @@ releases:
 - c2cgeoportal: 7f85181
   name: 2.4.1.33
   ngeo: e70b584
+- c2cgeoportal: 428dbcb
+  name: 2.4.1.34
+  ngeo: 739ab3d
+- c2cgeoportal: 039d409
+  name: 2.4.1.35
+  ngeo: a9fb83e

travis/publish

@@ -11,14 +11,14 @@ if [[ ${TAG} =~ ^[0-9]\.[0-9]\.[0-9]$ ]]
 then
     VERSION_QGIS=${TAG}
     .venv/bin/python travis/get-minor --reset
-    travis/changelog ${TAG}
+    .venv/bin/python travis/changelog ${TAG}
     COMMIT=TRUE
 else
     if [[ ${BRANCH_NAME} =~ ^[0-9]\.[0-9]$ ]]
     then
         VERSION_QGIS=${BRANCH_NAME}
         TAG=${LAST_TAG}.`.venv/bin/python travis/get-minor`
-        travis/changelog ${TAG}
+        .venv/bin/python travis/changelog ${TAG}
         COMMIT=TRUE
     fi
 fi

travis/requirements.txt

@@ -1,6 +1,7 @@
 docker-compose==1.23.2 # commons, rq.filter: <1.24
 netifaces==0.10.9
 PyYAML==5.1
+requests==2.22.0
 twine==1.13.0
 setuptools==41.0.1
 wheel==0.33.4