[Automated] Merged release main into develop

.github/workflows/prerelease.yml

@@ -43,10 +43,10 @@ jobs:
       uses: heinrichreimer/github-changelog-generator-action@v2.2
       with:
         token: ${{ secrets.ADMIN_TOKEN }}
-        breakingLabel: '#### 💥 Breaking'
-        enhancementLabel: '#### 🚀 Enhancements'
-        bugsLabel: '#### 🐛 Bug fixes'
-        deprecatedLabel: '#### ⚠️ Deprecations'
+        breakingLabel: '**💥 Breaking**'
+        enhancementLabel: '**🚀 Enhancements**'
+        bugsLabel: '**🐛 Bug fixes**'
+        deprecatedLabel: '**⚠️ Deprecations**'
         addSections: '{"documentation":{"prefix":"### 📖 Documentation","labels":["documentation"]},"tests":{"prefix":"### ✅ Testing","labels":["tests"]}}'
         issues: false
         issuesWoLabels: false

.github/workflows/release.yml

@@ -39,13 +39,14 @@ jobs:
       uses: heinrichreimer/github-changelog-generator-action@v2.2
       with:
         token: ${{ secrets.ADMIN_TOKEN }}
-        breakingLabel: '#### 💥 Breaking'
-        enhancementLabel: '#### 🚀 Enhancements'
-        bugsLabel: '#### 🐛 Bug fixes'
-        deprecatedLabel: '#### ⚠️ Deprecations'
+        breakingLabel: '**💥 Breaking**'
+        enhancementLabel: '**🚀 Enhancements**'
+        bugsLabel: '**🐛 Bug fixes**'
+        deprecatedLabel: '**⚠️ Deprecations**'
         addSections: '{"documentation":{"prefix":"### 📖 Documentation","labels":["documentation"]},"tests":{"prefix":"### ✅ Testing","labels":["tests"]}}'
         issues: false
         issuesWoLabels: false
+        sinceTag: "3.0.0"
         maxIssues: 100
         pullRequests: true
         prWoLabels: false
@@ -91,6 +92,7 @@ jobs:
         addSections: '{"documentation":{"prefix":"### 📖 Documentation","labels":["documentation"]},"tests":{"prefix":"### ✅ Testing","labels":["tests"]}}'
         issues: false
         issuesWoLabels: false
+        sinceTag: ${{ steps.version.outputs.last_release }}
         maxIssues: 100
         pullRequests: true
         prWoLabels: false
@@ -103,7 +105,7 @@ jobs:
         excludeTagsRegex: "CI/.+"
         releaseBranch: "main"
         stripHeaders: true
-        sinceTag: ${{ steps.version.outputs.last_release }}
+        base: ''
 
 
     - name: 🚀 Github Release

CHANGELOG.md

@@ -1,10 +1,10 @@
 # Changelog
 
-## [3.1.0-nightly.4](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.1.0](https://github.com/pypeclub/OpenPype/tree/3.1.0) (2021-06-15)
 
-[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.0.0...HEAD)
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.0.0...3.1.0)
 
-#### 🚀 Enhancements
+**🚀 Enhancements**
 
 - Log Viewer with OpenPype style [\#1703](https://github.com/pypeclub/OpenPype/pull/1703)
 - Scrolling in OpenPype info widget [\#1702](https://github.com/pypeclub/OpenPype/pull/1702)
@@ -21,7 +21,7 @@
 - Nuke - Publish simplification [\#1653](https://github.com/pypeclub/OpenPype/pull/1653)
 - \#1333 - added tooltip hints to Pyblish buttons [\#1649](https://github.com/pypeclub/OpenPype/pull/1649)
 
-#### 🐛 Bug fixes
+**🐛 Bug fixes**
 
 - Nuke: broken publishing rendered frames [\#1707](https://github.com/pypeclub/OpenPype/pull/1707)
 - Standalone publisher Thumbnail export args [\#1705](https://github.com/pypeclub/OpenPype/pull/1705)
@@ -33,9 +33,7 @@
 - Fix missing dbm python module [\#1652](https://github.com/pypeclub/OpenPype/pull/1652)
 - Transparent branches in view on Mac [\#1648](https://github.com/pypeclub/OpenPype/pull/1648)
 - Add asset on task item [\#1646](https://github.com/pypeclub/OpenPype/pull/1646)
-- Project manager save and queue [\#1645](https://github.com/pypeclub/OpenPype/pull/1645)
 - New project anatomy values [\#1644](https://github.com/pypeclub/OpenPype/pull/1644)
-- Farm publishing: check if published items do exist [\#1573](https://github.com/pypeclub/OpenPype/pull/1573)
 
 **Merged pull requests:**
 

openpype/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.1.0-nightly.4"
+__version__ = "3.1.0"

tools/ci_tools.py

@@ -92,6 +92,24 @@ def calculate_next_nightly(token="nightly"):
         next_tag = last_pre_v.bump_prerelease(token=token).__str__()
         return next_tag
 
+def finalize_latest_nightly():
+    last_prerelease, last_pre_tag = get_last_version("CI")
+    last_pre_v = VersionInfo.parse(last_prerelease)
+    last_pre_v_finalized = last_pre_v.finalize_version()
+    # print(last_pre_v_finalized)
+
+    return last_pre_v_finalized.__str__()
+
+def finalize_prerelease(prerelease):
+
+    if "/" in prerelease:
+        prerelease = prerelease.split("/")[-1]
+
+    prerelease_v = VersionInfo.parse(prerelease)
+    prerelease_v_finalized = prerelease_v.finalize_version()
+
+    return prerelease_v_finalized.__str__()
+
 
 def main():
     usage = "usage: %prog [options] arg"
@@ -102,12 +120,22 @@ def main():
     parser.add_option("-b", "--bump",
                       dest="bump", action="store_true",
                       help="Return if there is something to bump")
-    parser.add_option("-v", "--version",
-                      dest="version", action="store",
-                      help="work with explicit version")
+    parser.add_option("-r", "--release-latest",
+                      dest="releaselatest", action="store_true",
+                      help="finalize latest prerelease to a release")
     parser.add_option("-p", "--prerelease",
                       dest="prerelease", action="store",
                       help="define prerelease token")
+    parser.add_option("-f", "--finalize",
+                      dest="finalize", action="store",
+                      help="define prerelease token")
+    parser.add_option("-v", "--version",
+                      dest="version", action="store",
+                      help="work with explicit version")
+    parser.add_option("-l", "--lastversion",
+                      dest="lastversion", action="store",
+                      help="work with explicit version")
+
 
     (options, args) = parser.parse_args()
 
@@ -124,6 +152,25 @@ def main():
         print(next_tag_v)
         bump_file_versions(next_tag_v)
 
+    if options.finalize:
+        new_release = finalize_prerelease(options.finalize)
+        print(new_release)
+        bump_file_versions(new_release)
+
+    if options.lastversion:
+        last_release, last_release_tag = get_last_version(options.lastversion)
+        print(last_release_tag)
+
+    if options.releaselatest:
+        new_release = finalize_latest_nightly()
+        last_release, last_release_tag = get_last_version("release")
+
+        if VersionInfo.parse(new_release) > VersionInfo.parse(last_release):
+            print(new_release)
+            bump_file_versions(new_release)
+        else:
+            print("skip")
+
     if options.prerelease:
         current_prerelease = VersionInfo.parse(options.prerelease)
         new_prerelease = current_prerelease.bump_prerelease().__str__()