Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@koning
koning committed Mar 7, 2022
2 parents 05cdecb + ed79780 commit abc4c66
Show file tree
Hide file tree
Showing 47 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +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]
## [1.8.4]
### Added
- Auto-release of pypi packages
- Workflows Community Initiative metadata file
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Lawrence Livermore National Laboratory
Copyright (c) 2022 Lawrence Livermore National Laboratory

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
6 changes: 3 additions & 3 deletions merlin/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down Expand Up @@ -38,7 +38,7 @@
import sys


__version__ = "1.8.3"
__version__ = "1.8.4"
VERSION = __version__
PATH_TO_PROJ = os.path.join(os.path.dirname(__file__), "")

Expand Down
4 changes: 2 additions & 2 deletions merlin/ascii_art.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/celery.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/abstracts/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/abstracts/enums/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/openfilelist.py
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env python

###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/opennpylib.py
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env python

###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/sample_index.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/sample_index_factory.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/security/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/security/encrypt.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/security/encrypt_backend_traffic.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/tasks.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/common/util_sampling.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/config/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/config/broker.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/config/configfile.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/config/results_backend.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/data/celery/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/display.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/examples/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
4 changes: 2 additions & 2 deletions merlin/examples/examples.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
# Copyright (c) 2019, Lawrence Livermore National Security, LLC.
# Copyright (c) 2022, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
# Written by the Merlin dev team, listed in the CONTRIBUTORS file.
# <[email protected]>
#
# LLNL-CODE-797170
# All rights reserved.
# This file is part of Merlin, Version: 1.8.3.
# This file is part of Merlin, Version: 1.8.4.
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down
Loading

0 comments on commit abc4c66

Please sign in to comment.