From 13775f72f33687ad0c823d6e270f9a54e9ef7eaf Mon Sep 17 00:00:00 2001 From: Brian Gunnarson Date: Mon, 28 Oct 2024 10:50:40 -0700 Subject: [PATCH 1/2] update version to 1.12.2 --- CHANGELOG.md | 33 ++++++++----------- Makefile | 2 +- config.mk | 2 +- merlin/__init__.py | 4 +-- merlin/ascii_art.py | 2 +- merlin/celery.py | 2 +- merlin/common/__init__.py | 2 +- merlin/common/abstracts/__init__.py | 2 +- merlin/common/abstracts/enums/__init__.py | 2 +- merlin/common/dumper.py | 2 +- merlin/common/openfilelist.py | 2 +- merlin/common/opennpylib.py | 2 +- merlin/common/sample_index.py | 2 +- merlin/common/sample_index_factory.py | 2 +- merlin/common/security/__init__.py | 2 +- merlin/common/security/encrypt.py | 2 +- .../security/encrypt_backend_traffic.py | 2 +- merlin/common/tasks.py | 2 +- merlin/common/util_sampling.py | 2 +- merlin/config/__init__.py | 2 +- merlin/config/broker.py | 2 +- merlin/config/celeryconfig.py | 2 +- merlin/config/configfile.py | 2 +- merlin/config/results_backend.py | 2 +- merlin/config/utils.py | 2 +- merlin/data/celery/__init__.py | 2 +- merlin/display.py | 2 +- merlin/examples/__init__.py | 2 +- merlin/examples/examples.py | 2 +- merlin/examples/generator.py | 2 +- merlin/exceptions/__init__.py | 2 +- merlin/log_formatter.py | 2 +- merlin/main.py | 2 +- merlin/merlin_templates.py | 2 +- merlin/router.py | 2 +- merlin/server/__init__.py | 2 +- merlin/server/server_commands.py | 2 +- merlin/server/server_config.py | 2 +- merlin/server/server_util.py | 2 +- merlin/spec/__init__.py | 2 +- merlin/spec/all_keys.py | 2 +- merlin/spec/defaults.py | 2 +- merlin/spec/expansion.py | 2 +- merlin/spec/override.py | 2 +- merlin/spec/specification.py | 2 +- merlin/study/__init__.py | 2 +- merlin/study/batch.py | 2 +- merlin/study/celeryadapter.py | 2 +- merlin/study/dag.py | 2 +- merlin/study/script_adapter.py | 2 +- merlin/study/status.py | 2 +- merlin/study/status_constants.py | 2 +- merlin/study/status_renderers.py | 2 +- merlin/study/step.py | 2 +- merlin/study/study.py | 2 +- merlin/utils.py | 2 +- setup.py | 2 +- tests/conftest.py | 2 +- .../celery_workers_manager.py | 2 +- tests/integration/conditions.py | 2 +- tests/integration/definitions.py | 2 +- tests/integration/run_tests.py | 4 +-- tests/integration/test_celeryadapter.py | 2 +- tests/unit/study/__init__.py | 2 +- .../status_test_files/combine_status_files.py | 2 +- .../study/status_test_files/shared_tests.py | 2 +- .../status_test_variables.py | 2 +- tests/unit/study/test_detailed_status.py | 2 +- tests/unit/study/test_status.py | 2 +- 69 files changed, 84 insertions(+), 89 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efa43f947..5bd534b1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,25 +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] -### Added -- Several new unit tests for the following subdirectories: - - `merlin/common/` - - `merlin/config/` - - `merlin/examples/` - - `merlin/server/` -- Context managers for the `conftest.py` file to ensure safe spin up and shutdown of fixtures - - `RedisServerManager`: context to help with starting/stopping a redis server for tests - - `CeleryWorkersManager`: context to help with starting/stopping workers for tests -- Ability to copy and print the `Config` object from `merlin/config/__init__.py` -- Equality method to the `ContainerFormatConfig` and `ContainerConfig` objects from `merlin/server/server_util.py` - -### Changed -- Split the `start_server` and `config_server` functions of `merlin/server/server_commands.py` into multiple functions to make testing easier -- Split the `create_server_config` function of `merlin/server/server_config.py` into two functions to make testing easier -- Combined `set_snapshot_seconds` and `set_snapshot_changes` methods of `RedisConfig` into one method `set_snapshot` - -## [1.12.2b1] +## [1.12.2] ### Added - Conflict handler option to the `dict_deep_merge` function in `utils.py` - Ability to add module-specific pytest fixtures @@ -37,6 +19,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - New step return code `$(MERLIN_RAISE_ERROR)` to force an error to be raised by a task (mainly for testing) - Added description of this to docs - New test to ensure a single failed task won't break a workflow +- Several new unit tests for the following subdirectories: + - `merlin/common/` + - `merlin/config/` + - `merlin/examples/` + - `merlin/server/` +- Context managers for the `conftest.py` file to ensure safe spin up and shutdown of fixtures + - `RedisServerManager`: context to help with starting/stopping a redis server for tests + - `CeleryWorkersManager`: context to help with starting/stopping workers for tests +- Ability to copy and print the `Config` object from `merlin/config/__init__.py` +- Equality method to the `ContainerFormatConfig` and `ContainerConfig` objects from `merlin/server/server_util.py` ### Changed - `merlin info` is cleaner and gives python package info @@ -46,6 +38,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added fixtures for `merlin status` tests that copy the workspace to a temporary directory so you can see exactly what's run in a test - Batch block and workers now allow for variables to be used in node settings - Task id is now the path to the directory +- Split the `start_server` and `config_server` functions of `merlin/server/server_commands.py` into multiple functions to make testing easier +- Split the `create_server_config` function of `merlin/server/server_config.py` into two functions to make testing easier +- Combined `set_snapshot_seconds` and `set_snapshot_changes` methods of `RedisConfig` into one method `set_snapshot` ### Fixed - Bugfix for output of `merlin example openfoam_wf_singularity` diff --git a/Makefile b/Makefile index 08fb7d0f8..a261b1d99 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/config.mk b/config.mk index f1cfbcea3..1d6455ae3 100644 --- a/config.mk +++ b/config.mk @@ -18,7 +18,7 @@ else endif VER?=1.0.0 -VSTRING=[0-9]\+\.[0-9]\+\.[0-9]\+ +VSTRING=[0-9]\+\.[0-9]\+\.[0-9]\+\(b[0-9]\+\)\? YEAR=20[0-9][0-9] NEW_YEAR?=2023 CHANGELOG_VSTRING="## \[$(VSTRING)\]" diff --git a/merlin/__init__.py b/merlin/__init__.py index a2d173a8f..b6c065fd7 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # @@ -38,7 +38,7 @@ import sys -__version__ = "1.12.2b1" +__version__ = "1.12.2" VERSION = __version__ PATH_TO_PROJ = os.path.join(os.path.dirname(__file__), "") diff --git a/merlin/ascii_art.py b/merlin/ascii_art.py index 5c90a4b12..bcada70af 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/celery.py b/merlin/celery.py index eb10f1a12..81a17c5b2 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/__init__.py b/merlin/common/__init__.py index 57477ea1f..37cabcad1 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/abstracts/__init__.py b/merlin/common/abstracts/__init__.py index 57477ea1f..37cabcad1 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/abstracts/enums/__init__.py b/merlin/common/abstracts/enums/__init__.py index a95ba0872..00d90232b 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/dumper.py b/merlin/common/dumper.py index 96a940357..5757b97ec 100644 --- a/merlin/common/dumper.py +++ b/merlin/common/dumper.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1 +# This file is part of Merlin, Version: 1.12.2 # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/openfilelist.py b/merlin/common/openfilelist.py index 16aa2f87c..790054c16 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/opennpylib.py b/merlin/common/opennpylib.py index 872699ae1..ba6e9dcc6 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/sample_index.py b/merlin/common/sample_index.py index caea6ad6e..e52ded9c7 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/sample_index_factory.py b/merlin/common/sample_index_factory.py index eb4fbcc61..75de4676b 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/security/__init__.py b/merlin/common/security/__init__.py index 57477ea1f..37cabcad1 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/security/encrypt.py b/merlin/common/security/encrypt.py index ad42d79d9..e38b0ebbd 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # 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 index d597f084b..23bdaacf8 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/tasks.py b/merlin/common/tasks.py index 143d3bf12..736d92225 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/common/util_sampling.py b/merlin/common/util_sampling.py index 1396016c7..21c97c709 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/config/__init__.py b/merlin/config/__init__.py index 7bd8028fb..f1451b4c4 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/config/broker.py b/merlin/config/broker.py index fd33ba2e5..6145691a5 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/config/celeryconfig.py b/merlin/config/celeryconfig.py index 5794599dc..ff006c739 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/config/configfile.py b/merlin/config/configfile.py index 1634b833f..010641a3f 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/config/results_backend.py b/merlin/config/results_backend.py index 893c52f04..ae58f0340 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/config/utils.py b/merlin/config/utils.py index c37936d9e..090398187 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/data/celery/__init__.py b/merlin/data/celery/__init__.py index 57477ea1f..37cabcad1 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/display.py b/merlin/display.py index a1af0ac28..65818ce05 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/examples/__init__.py b/merlin/examples/__init__.py index 57477ea1f..37cabcad1 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/examples/examples.py b/merlin/examples/examples.py index 371471550..1b88783ff 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/examples/generator.py b/merlin/examples/generator.py index 7dea1ba82..bdb764b30 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/exceptions/__init__.py b/merlin/exceptions/__init__.py index 572135aec..158c6f073 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/log_formatter.py b/merlin/log_formatter.py index 6cd6a745a..55f5f37f8 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/main.py b/merlin/main.py index f09860a9d..6ca79e86d 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/merlin_templates.py b/merlin/merlin_templates.py index 5253c79e4..f82d814f6 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/router.py b/merlin/router.py index d9114bbcd..552323260 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/server/__init__.py b/merlin/server/__init__.py index 522d67d1d..df2fc6e6a 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. diff --git a/merlin/server/server_commands.py b/merlin/server/server_commands.py index 0bb57b490..bb31d6b09 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/server/server_config.py b/merlin/server/server_config.py index fe65219b3..36c2165bb 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/server/server_util.py b/merlin/server/server_util.py index 30de856af..15f591264 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/spec/__init__.py b/merlin/spec/__init__.py index 57477ea1f..37cabcad1 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/spec/all_keys.py b/merlin/spec/all_keys.py index fbb70f8d7..706111851 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/spec/defaults.py b/merlin/spec/defaults.py index 6c9bd9c09..1aa700607 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/spec/expansion.py b/merlin/spec/expansion.py index ac514a369..b9f9eee65 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/spec/override.py b/merlin/spec/override.py index 316e76f86..049d8030f 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/spec/specification.py b/merlin/spec/specification.py index 5ffffd959..141ebf297 100644 --- 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.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/__init__.py b/merlin/study/__init__.py index 57477ea1f..37cabcad1 100644 --- a/merlin/study/__init__.py +++ b/merlin/study/__init__.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/batch.py b/merlin/study/batch.py index 16482f399..cf2c53116 100644 --- a/merlin/study/batch.py +++ b/merlin/study/batch.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/celeryadapter.py b/merlin/study/celeryadapter.py index 5b5bdd419..60bded1b2 100644 --- a/merlin/study/celeryadapter.py +++ b/merlin/study/celeryadapter.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/dag.py b/merlin/study/dag.py index c1b9dff78..06f75beac 100644 --- a/merlin/study/dag.py +++ b/merlin/study/dag.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/script_adapter.py b/merlin/study/script_adapter.py index 6380b1a9b..b76eb2172 100644 --- a/merlin/study/script_adapter.py +++ b/merlin/study/script_adapter.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/status.py b/merlin/study/status.py index fbeb4d46d..b785ee140 100644 --- a/merlin/study/status.py +++ b/merlin/study/status.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1 +# This file is part of Merlin, Version: 1.12.2 # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/status_constants.py b/merlin/study/status_constants.py index b7dfe7fa3..78ce331a6 100644 --- a/merlin/study/status_constants.py +++ b/merlin/study/status_constants.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1 +# This file is part of Merlin, Version: 1.12.2 # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/status_renderers.py b/merlin/study/status_renderers.py index 02d6ab948..2100c2bda 100644 --- a/merlin/study/status_renderers.py +++ b/merlin/study/status_renderers.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1 +# This file is part of Merlin, Version: 1.12.2 # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/step.py b/merlin/study/step.py index 26d737e14..8e0356b68 100644 --- a/merlin/study/step.py +++ b/merlin/study/step.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/study/study.py b/merlin/study/study.py index f30e36058..1d7b9d96d 100644 --- a/merlin/study/study.py +++ b/merlin/study/study.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/merlin/utils.py b/merlin/utils.py index 2e69f5779..50b3474e2 100644 --- a/merlin/utils.py +++ b/merlin/utils.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/setup.py b/setup.py index 0ee113e0a..48def98f6 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/conftest.py b/tests/conftest.py index 11bd93134..eb68542bf 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/context_managers/celery_workers_manager.py b/tests/context_managers/celery_workers_manager.py index 118aa21a1..5e750b6ef 100644 --- a/tests/context_managers/celery_workers_manager.py +++ b/tests/context_managers/celery_workers_manager.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/integration/conditions.py b/tests/integration/conditions.py index 83f07aafe..1c852b064 100644 --- a/tests/integration/conditions.py +++ b/tests/integration/conditions.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/integration/definitions.py b/tests/integration/definitions.py index 59c1fa256..18435d461 100644 --- a/tests/integration/definitions.py +++ b/tests/integration/definitions.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/integration/run_tests.py b/tests/integration/run_tests.py index ef2bef882..ba5d4bb45 100644 --- a/tests/integration/run_tests.py +++ b/tests/integration/run_tests.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # @@ -41,7 +41,7 @@ from tabulate import tabulate -from tests.integration.definitions import OUTPUT_DIR, define_tests # pylint: disable=E0401 +from definitions import OUTPUT_DIR, define_tests # pylint: disable=E0401 def get_definition_issues(test): diff --git a/tests/integration/test_celeryadapter.py b/tests/integration/test_celeryadapter.py index 0572d6c66..a40f1054b 100644 --- a/tests/integration/test_celeryadapter.py +++ b/tests/integration/test_celeryadapter.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/unit/study/__init__.py b/tests/unit/study/__init__.py index 57477ea1f..37cabcad1 100644 --- a/tests/unit/study/__init__.py +++ b/tests/unit/study/__init__.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/unit/study/status_test_files/combine_status_files.py b/tests/unit/study/status_test_files/combine_status_files.py index f7021a97a..b52b35f1d 100644 --- a/tests/unit/study/status_test_files/combine_status_files.py +++ b/tests/unit/study/status_test_files/combine_status_files.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/unit/study/status_test_files/shared_tests.py b/tests/unit/study/status_test_files/shared_tests.py index fb31b96a7..3e6b0fde8 100644 --- a/tests/unit/study/status_test_files/shared_tests.py +++ b/tests/unit/study/status_test_files/shared_tests.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/unit/study/status_test_files/status_test_variables.py b/tests/unit/study/status_test_files/status_test_variables.py index ffb3cba31..6a7f7eb28 100644 --- a/tests/unit/study/status_test_files/status_test_variables.py +++ b/tests/unit/study/status_test_files/status_test_variables.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/unit/study/test_detailed_status.py b/tests/unit/study/test_detailed_status.py index ae278c975..e6eea4748 100644 --- a/tests/unit/study/test_detailed_status.py +++ b/tests/unit/study/test_detailed_status.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # diff --git a/tests/unit/study/test_status.py b/tests/unit/study/test_status.py index 9d602848f..6786a1230 100644 --- a/tests/unit/study/test_status.py +++ b/tests/unit/study/test_status.py @@ -6,7 +6,7 @@ # # LLNL-CODE-797170 # All rights reserved. -# This file is part of Merlin, Version: 1.12.2b1. +# This file is part of Merlin, Version: 1.12.2. # # For details, see https://github.com/LLNL/merlin. # From 72065e34f7f706af46c800f30d07de8d48a502b1 Mon Sep 17 00:00:00 2001 From: Brian Gunnarson Date: Mon, 28 Oct 2024 10:55:06 -0700 Subject: [PATCH 2/2] fix style issue --- tests/integration/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/run_tests.py b/tests/integration/run_tests.py index ba5d4bb45..868ec1c3a 100644 --- a/tests/integration/run_tests.py +++ b/tests/integration/run_tests.py @@ -41,7 +41,7 @@ from tabulate import tabulate -from definitions import OUTPUT_DIR, define_tests # pylint: disable=E0401 +from tests.integration.definitions import OUTPUT_DIR, define_tests # pylint: disable=E0401 def get_definition_issues(test):