Merge branch 'update-versions-patch' into '2.8.3.1-patch'

update versions for patch release

See merge request !1682

.bumpversion.toml

@@ -2,7 +2,7 @@
 # Docs: https://callowayproject.github.io/bump-my-version/
 # NB: Run with `--ignore-missing-version` flag to ignore PyCAPO's version
 [tool.bumpversion]
-current_version = "2.8.3.1rc1"
+current_version = "2.8.3.1"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.
@@ -11,13 +11,15 @@ parse = """(?x)
         \\.(?P<smallpatch>0|[1-9]\\d*)
     )?                                  # smallpatch section is optional
     (?:
-        (?P<pre_l>[a-zA-Z-]+)           # pre-release label
+        (?P<pre_l>[a-zA-Z-]+|\\.[a-zA-Z-]+)   # pre-release label
         (?P<pre_n>0|[1-9]\\d*)            # pre-release version number
     )?                                  # pre-release section is optional
 """
 serialize = [
     "{major}.{minor}.{patch}{pre_l}{pre_n}",
+    "{major}.{minor}.{patch}.{pre_l}{pre_n}",
     "{major}.{minor}.{patch}.{smallpatch}{pre_l}{pre_n}",
+    "{major}.{minor}.{patch}.{smallpatch}.{pre_l}{pre_n}",
     "{major}.{minor}.{patch}.{smallpatch}",
     "{major}.{minor}.{patch}",
 ]
@@ -25,7 +27,7 @@ allow_dirty = true
 ignore_missing_version = true
 
 [tool.bumpversion.parts.pre_l]
-values = ["dev", "rc", "final"]    # Python Versioning: https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers
+values = [".dev", "rc", "final"]    # Python Versioning: https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers
 optional_value = "final"
 
 [tool.bumpversion.parts.pre_n]

.gitlab-ci.yml

@@ -24,7 +24,7 @@ variables:
     POSTGRES_DB: archive
     POSTGRES_USER: "archive"
     POSTGRES_PASSWORD: "docker"
-    RELEASE_VERSION: 2.8.3.1rc1
+    RELEASE_VERSION: 2.8.3.1
 
 image: docker:19.03.12
 

apps/cli/executables/go/spelunker/main.go

@@ -46,7 +46,7 @@ func main() {
 
 	if *v {
 		//TODO: fix version system for containers
-		log.Println("2.8.3.1rc1")
+		log.Println("2.8.3.1")
 		os.Exit(0)
 	}
 

apps/cli/executables/pexable/carta_envoy/carta_envoy/__init__.py

@@ -18,4 +18,4 @@
 """
 Workspaces system for launching CARTA for viewing images
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/carta_envoy/pyproject.toml

 [tool.poetry]
 name = "carta_envoy"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "Workspaces system for launching CARTA for viewing images"
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/casa_envoy/casa_envoy/__init__.py

@@ -18,4 +18,4 @@
 """
 Workspaces CASA functionality bridge
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/casa_envoy/pyproject.toml

 [tool.poetry]
 name = "casa_envoy"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "Workspaces CASA functionality bridge"
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/conveyor/conveyor/__init__.py

@@ -18,4 +18,4 @@
 """
 Conveyor
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/conveyor/pyproject.toml

 [tool.poetry]
 name = "conveyor"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "Conveyor"
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/data_annotator/data_annotator/__init__.py

@@ -18,4 +18,4 @@
 """
 Workspaces metrics reporter for users outside of SSA.
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/data_annotator/pyproject.toml

 [tool.poetry]
 name = "data_annotator"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "Workspaces CLI tool for creating and deleting comments associated with data quality."
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/deliver/delivery/__init__.py

@@ -18,4 +18,4 @@
 """
 Workspaces data delivery module
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/deliver/pyproject.toml

 [tool.poetry]
 name = "ssa_deliver"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "Workspaces data delivery module"
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/ingest_envoy/ingest_envoy/__init__.py

@@ -18,4 +18,4 @@
 """
 Ingest envoy
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/ingest_envoy/pyproject.toml

 [tool.poetry]
 name = "ingest_envoy"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "Ingest envoy"
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/mediator/pyproject.toml

 [tool.poetry]
 name = "ssa_mediator"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "Mediator: the Workspaces intervention utility"
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/mediator/system_mediator/__init__.py

@@ -18,4 +18,4 @@
 """
 Mediator: the Workspaces intervention utility
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/null/null/__init__.py

@@ -18,4 +18,4 @@
 """
 This is the null executable, a baseline test of the functionality of the Workspaces system.
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"

apps/cli/executables/pexable/null/pyproject.toml

 [tool.poetry]
 name = "ssa_null"
-version = "2.8.3.1rc1"
+version = "2.8.3.1"
 description = "This is the null executable, a baseline test of the functionality of the Workspaces system."
 authors = ["DMS SSA <dms-ssa@nrao.edu>"]
 license = "GPL3+"

apps/cli/executables/pexable/productfetcher/productfetcher/__init__.py

@@ -18,4 +18,4 @@
 """
 Product fetcher: retrieve products from NGAS and other places for the archive and place them on disk
 """
-__version__ = "2.8.3.1rc1"
+__version__ = "2.8.3.1"