Merge remote-tracking branch 'origin/v90-bugfix' into v9-minor

.gitlab/merge_request_templates/Code_Review.md

@@ -27,5 +27,6 @@
 ### Does this merge request introduce an API change? :warning:
 
 * [ ] No, **or** as far as possible, the code ensures backwards compatibility.
-* [ ] No, **or** the `SCIP_APIVERSION` is updated (use label 'public SCIP API'; in particular if new `SCIP_EXPORT` methods have been added).
+* [ ] No, **or** the `SCIP_APIVERSION` will be updated (use label 'public SCIP API'; in particular if new `SCIP_EXPORT` methods have been added).
+  To update `SCIP_APIVERSION`, run `scripts/updateversion.py -a` on branch **master** after the changes of this MR have arrived in the master branch (if this is a merge into vX-minor, then first merge vX-minor into master or wait for the Jenkins job that does that).
 * [ ] No parameter was added/deleted/changed **or** the MR is tagged with the label 'default parameter'. (This includes the addition of parameters by adding/deleting a plugin.)

scripts/updateversion.py

@@ -84,8 +84,8 @@
     if newapiversion != oldapiversion:
         print("\nAPI versions before the change:")
         print(commands.getoutput('grep -e "APIVERSION" -e "SCIP_VERSION_API" make/make.project CMakeLists.txt'))
-        if newsubversion == "0":
-            print "\nWarning: API version increased for what seems to be a bugfix version (%s)" %(newversionstring)
+        if newminor != "0" or newpatch != "0":
+            print "\nWarning: API version increased for what does not seem to be the master branch (version %s)" %(newversionstring)
         commands.getoutput('sed -i "s/^SCIP_VERSION_API.*/SCIP_VERSION_API = %-s/" make/make.project' % newapiversion)
         commands.getoutput('sed -i "s/set(SCIP_VERSION_API [0-9]*)/set(SCIP_VERSION_API %s)/" CMakeLists.txt' \
                            %(newapiversion))