bump to version 1.10.3 (#444)

bgunnar5 · web-flow · commit 970a06fd6e4b · 2023-08-18T16:20:26.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,7 @@ All notable changes to Merlin will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
-### Fixed
-
+## [1.10.3]
 ### Added
 - The *.conf regex for the recursive-include of the merlin server directory so that pip will add it to the wheel
 - A note to the docs for how to fix an issue where the `merlin server start` command hangs
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/__init__.py b/merlin/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
@@ -38,7 +38,7 @@
 import sys
 
 
-__version__ = "1.10.2"
+__version__ = "1.10.3"
 VERSION = __version__
 PATH_TO_PROJ = os.path.join(os.path.dirname(__file__), "")
 
diff --git a/merlin/ascii_art.py b/merlin/ascii_art.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/celery.py b/merlin/celery.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/__init__.py b/merlin/common/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/abstracts/__init__.py b/merlin/common/abstracts/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/abstracts/enums/__init__.py b/merlin/common/abstracts/enums/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/openfilelist.py b/merlin/common/openfilelist.py
@@ -8,7 +8,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/opennpylib.py b/merlin/common/opennpylib.py
@@ -8,7 +8,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/sample_index.py b/merlin/common/sample_index.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/sample_index_factory.py b/merlin/common/sample_index_factory.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/security/__init__.py b/merlin/common/security/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/security/encrypt.py b/merlin/common/security/encrypt.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/security/encrypt_backend_traffic.py b/merlin/common/security/encrypt_backend_traffic.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/tasks.py b/merlin/common/tasks.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/common/util_sampling.py b/merlin/common/util_sampling.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/config/__init__.py b/merlin/config/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/config/broker.py b/merlin/config/broker.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/config/celeryconfig.py b/merlin/config/celeryconfig.py
@@ -10,7 +10,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/config/configfile.py b/merlin/config/configfile.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/config/results_backend.py b/merlin/config/results_backend.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/config/utils.py b/merlin/config/utils.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/data/celery/__init__.py b/merlin/data/celery/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/display.py b/merlin/display.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/examples/__init__.py b/merlin/examples/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/examples/examples.py b/merlin/examples/examples.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/examples/generator.py b/merlin/examples/generator.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/exceptions/__init__.py b/merlin/exceptions/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/log_formatter.py b/merlin/log_formatter.py
@@ -8,7 +8,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/main.py b/merlin/main.py
@@ -8,7 +8,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/merlin_templates.py b/merlin/merlin_templates.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/router.py b/merlin/router.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/server/__init__.py b/merlin/server/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 
 #
 # For details, see https://github.com/LLNL/merlin.
diff --git a/merlin/server/server_commands.py b/merlin/server/server_commands.py
@@ -8,7 +8,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/server/server_config.py b/merlin/server/server_config.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/server/server_util.py b/merlin/server/server_util.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/spec/__init__.py b/merlin/spec/__init__.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/spec/all_keys.py b/merlin/spec/all_keys.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/spec/defaults.py b/merlin/spec/defaults.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/spec/expansion.py b/merlin/spec/expansion.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/spec/override.py b/merlin/spec/override.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/spec/specification.py b/merlin/spec/specification.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin, Version: 1.10.2.
+# This file is part of Merlin, Version: 1.10.3.
 #
 # For details, see https://github.com/LLNL/merlin.
 #
diff --git a/merlin/study/__init__.py b/merlin/study/__init__.py
diff --git a/merlin/study/batch.py b/merlin/study/batch.py
diff --git a/merlin/study/celeryadapter.py b/merlin/study/celeryadapter.py
diff --git a/merlin/study/dag.py b/merlin/study/dag.py
diff --git a/merlin/study/script_adapter.py b/merlin/study/script_adapter.py
diff --git a/merlin/study/step.py b/merlin/study/step.py
diff --git a/merlin/study/study.py b/merlin/study/study.py
diff --git a/merlin/utils.py b/merlin/utils.py
diff --git a/setup.py b/setup.py
diff --git a/tests/integration/conditions.py b/tests/integration/conditions.py
diff --git a/tests/integration/run_tests.py b/tests/integration/run_tests.py
diff --git a/tests/integration/test_definitions.py b/tests/integration/test_definitions.py

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`# LLNL-CODE-797170`
`8`	`8`	`# All rights reserved.`
`9`		`-# This file is part of Merlin, Version: 1.10.2.`
	`9`	`+# This file is part of Merlin, Version: 1.10.3.`
`10`	`10`	`#`
`11`	`11`	`# For details, see https://github.com/LLNL/merlin.`
`12`	`12`	`#`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`# LLNL-CODE-797170`
`10`	`10`	`# All rights reserved.`
`11`		`-# This file is part of Merlin, Version: 1.10.2.`
	`11`	`+# This file is part of Merlin, Version: 1.10.3.`
`12`	`12`	`#`
`13`	`13`	`# For details, see https://github.com/LLNL/merlin.`
`14`	`14`	`#`