{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":222809980,"defaultBranch":"develop","name":"merlin","ownerLogin":"LLNL","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2019-11-19T23:31:13.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/5921419?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1716567522.0","currentOid":""},"activityList":{"items":[{"before":"1d701f937c87364e25e57868c64cbea81cf11d52","after":"f292d3aca8d42087a46de85b43c317a118797bb5","ref":"refs/heads/feature/scriptadapter_ignored","pushedAt":"2024-05-24T16:29:53.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Run fix-style","shortMessageHtmlLink":"Run fix-style"}},{"before":"9185a01041b444b76b41b7dfa8511abafac9cd0e","after":"1d701f937c87364e25e57868c64cbea81cf11d52","ref":"refs/heads/feature/scriptadapter_ignored","pushedAt":"2024-05-24T16:23:32.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Use els branch for log.debug message.","shortMessageHtmlLink":"Use els branch for log.debug message."}},{"before":null,"after":"9185a01041b444b76b41b7dfa8511abafac9cd0e","ref":"refs/heads/feature/scriptadapter_ignored","pushedAt":"2024-05-24T16:18:42.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Ignore shell in parallel command construction","shortMessageHtmlLink":"Ignore shell in parallel command construction"}},{"before":"897312fda2265d59a639c6fa28126401d7d4266d","after":"297d9d5382f26e680699b4c902383b3ff644058d","ref":"refs/heads/develop","pushedAt":"2024-05-22T19:54:41.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"bugfix/status_nested_workspace (#480)\n\n* remove a merge conflict statement that was missed\r\n\r\n* have status ignore nested workspaces and modify merge rules\r\n\r\n* update CHANGELOG\r\n\r\n* fixed issue with escape sequences in ascii art\r\n\r\n* apply Luc's suggestion\r\n\r\n* add setuptools as a requirement since python 3.12 doesn't have it natively\r\n\r\n* modify unit tests for status to use pytest rather than unittest\r\n\r\n* update CHANGELOG\r\n\r\n* add fixtures for status testing and add nested workflow test\r\n\r\n* update CHANGELOG","shortMessageHtmlLink":"bugfix/status_nested_workspace (#480)"}},{"before":"12f239870cd8dc2da07b4f672be2ea67813712c1","after":"897312fda2265d59a639c6fa28126401d7d4266d","ref":"refs/heads/develop","pushedAt":"2024-05-16T19:44:48.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Fix link to merlin banner image (#479)","shortMessageHtmlLink":"Fix link to merlin banner image (#479)"}},{"before":"dd96092fd46aaf4b2db65c8679e901a9c2b12450","after":"12f239870cd8dc2da07b4f672be2ea67813712c1","ref":"refs/heads/develop","pushedAt":"2024-05-16T17:38:04.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Target is in source's history (#478)\n\n* New github action test to make sure target has been merged into source","shortMessageHtmlLink":"Target is in source's history (#478)"}},{"before":"ca128c01d8d71589abe4bcb09fd566f73581d300","after":null,"ref":"refs/heads/design_optimization_template","pushedAt":"2024-05-16T17:02:31.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"768ac789811e15ea628b20d76bd524575badd6a6","after":null,"ref":"refs/heads/release/1.8.4","pushedAt":"2024-05-16T17:02:30.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"ec42de4357490116a804a183106be164f1d70211","after":null,"ref":"refs/heads/bugfix/mubarka1/sample_gen_err","pushedAt":"2024-05-16T17:02:28.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"08d358472e7b018ecb2d7896e77745b538806b7d","after":null,"ref":"refs/heads/bugfix/mubarka1/readthedocs","pushedAt":"2024-05-16T17:02:25.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"ec46358dc2bcc75d48936a2058d190dbe6ca42b8","after":null,"ref":"refs/heads/revert-314-develop","pushedAt":"2024-05-16T17:02:18.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"6ddf9484ea9bad009ebdcffdb57d0cee0070b7d4","after":null,"ref":"refs/heads/refactor/ben/click","pushedAt":"2024-05-16T17:02:16.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"9ae743df1ba242da109cdfd7617eb21169cab960","after":null,"ref":"refs/heads/feature/ben/server_bool","pushedAt":"2024-05-16T17:02:14.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"95cd5f6766777359eea0a5632294a48dab94fba6","after":null,"ref":"refs/heads/refactor/ben/decouple_from_maestro_2","pushedAt":"2024-05-16T17:02:12.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"151d10c3ce2e6d4db30a2d2e88452ddf41e1e0a0","after":null,"ref":"refs/heads/refactor/ben/decouple_from_maestro","pushedAt":"2024-05-16T17:02:11.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"dc95a645ddb94585f7a9b14e75ed0a429ef25855","after":null,"ref":"refs/heads/tests/ben/gitlab_ci","pushedAt":"2024-05-16T17:02:10.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"342531bbf956d8f2349027ea82f7863fc07966b5","after":null,"ref":"refs/heads/refactor/ben/override_maestro_validation","pushedAt":"2024-05-16T17:02:08.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"72ca24ca816a74e7f7075513f6491b0847827871","after":null,"ref":"refs/heads/bugfix/ben/serializer","pushedAt":"2024-05-16T17:02:06.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"0c9775a62936b980cc45a93d1088ad1311591dd9","after":null,"ref":"refs/heads/PR","pushedAt":"2024-05-16T17:01:27.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"de4aa80a66b91b7dc09aa32e9ab21332f2236df7","after":null,"ref":"refs/heads/feature/auto_publish","pushedAt":"2024-05-16T17:01:24.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"6cc0a10218c86d0f7a061a6a97ea71eb0df52750","after":null,"ref":"refs/heads/feature/better_info","pushedAt":"2024-05-16T17:01:06.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"f476a98514f6ce3e4b8c67f61dd0c519b789374c","after":"dd96092fd46aaf4b2db65c8679e901a9c2b12450","ref":"refs/heads/develop","pushedAt":"2024-05-16T16:57:22.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Improved Info (#477)\n\n* Add merlin version to banner\r\n\r\n* Add python package info to and clean up 'merlin info'\r\n\r\n* Add some unit tests\r\n\r\n* Force GitHub runner checkout to grab the whole history, fixing CHANGELOG test bug\r\n\r\n* Update CHANGELOG to show bugfix to CHANGELOG test","shortMessageHtmlLink":"Improved Info (#477)"}},{"before":null,"after":"6cc0a10218c86d0f7a061a6a97ea71eb0df52750","ref":"refs/heads/feature/better_info","pushedAt":"2024-05-16T04:40:53.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Updating github action for CHANGELOG check","shortMessageHtmlLink":"Updating github action for CHANGELOG check"}},{"before":"eace86fbc355654dd5868ba0a6401995cbc0de84","after":"f476a98514f6ce3e4b8c67f61dd0c519b789374c","ref":"refs/heads/develop","pushedAt":"2024-05-10T16:03:49.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"bugfix/deep-merge-existing-keys (#476)\n\n* remove a merge conflict statement that was missed\r\n\r\n* add a 'pip freeze' call in github workflow to view reqs versions\r\n\r\n* remove DeepMergeException and add conflict_handler to dict_deep_merge\r\n\r\n* add conflict handler to dict_deep_merge\r\n\r\n* fix broken tests for detailed-status\r\n\r\n* use caplog fixture rather than IO stream\r\n\r\n* add ability to define module-specific fixtures\r\n\r\n* add tests for read/write status files and conlict handling\r\n\r\n* add caplog explanation to docstrings\r\n\r\n* update CHANGELOG\r\n\r\n* run fix-style\r\n\r\n* add pytest-mock as dependency for test suite\r\n\r\n* clean up input check in dict_deep_merge","shortMessageHtmlLink":"bugfix/deep-merge-existing-keys (#476)"}},{"before":"ce58c6e0a71c2220f3f511974cb1027a9790f87c","after":"a1a6c19d3a5a67f5ae2043f43f97771930fb45be","ref":"refs/heads/feature/celery_multi","pushedAt":"2024-05-07T22:35:25.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Run flake8.","shortMessageHtmlLink":"Run flake8."}},{"before":null,"after":"ce58c6e0a71c2220f3f511974cb1027a9790f87c","ref":"refs/heads/feature/celery_multi","pushedAt":"2024-05-07T22:19:21.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"The new 'multi' merlin resource keyword is available to start multiple celery workers on a node. Setting this variable to True will start the celery workers as daemons.","shortMessageHtmlLink":"The new 'multi' merlin resource keyword is available to start multipl…"}},{"before":"bba68abba4fdf425c638163b79004afe2518915b","after":null,"ref":"refs/tags/1.12.1","pushedAt":"2024-05-02T21:49:36.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"}},{"before":"bba68abba4fdf425c638163b79004afe2518915b","after":"eace86fbc355654dd5868ba0a6401995cbc0de84","ref":"refs/heads/develop","pushedAt":"2024-04-30T15:13:33.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"Fix filenames for OpenFoam tutorial (#475)","shortMessageHtmlLink":"Fix filenames for OpenFoam tutorial (#475)"}},{"before":"60e46d71e09e142ee53cf51573f15ab1d547d5a2","after":"b4321d02677aade6a5b6e413b223664f7889bd94","ref":"refs/heads/main","pushedAt":"2024-04-16T15:18:24.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"Version/1.12.1 (#473)\n\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* Bugfix/filename-special-vars (#425)\r\n\r\n* fix file naming bug\r\n\r\n* fix filename bug with variable as study name\r\n\r\n* add tests for the file name special vars changes\r\n\r\n* modify changelog\r\n\r\n* implement Luc's suggestions\r\n\r\n* remove replace line\r\n\r\n* Create dependabot-changelog-updater.yml\r\n\r\n* testing outputs of modifying changelog\r\n\r\n* delete dependabot-changelog-updater\r\n\r\n* feature/pdf-docs (#427)\r\n\r\n* first attempt at adding pdf\r\n\r\n* fixing build error\r\n\r\n* modify changelog to show docs changes\r\n\r\n* fix errors Luc found in the build logs\r\n\r\n* trying out removal of latex\r\n\r\n* reverting latex changes back\r\n\r\n* uncommenting the latex_elements settings\r\n\r\n* adding epub to see if latex will build\r\n\r\n* adding a latex engine variable to conf\r\n\r\n* fix naming error with latex_engine\r\n\r\n* attempting to add a logo to the pdf build\r\n\r\n* testing an override to the searchtools file\r\n\r\n* revert back to not using searchtools override\r\n\r\n* update changelog\r\n\r\n* bugfix/openfoam_singularity_issues (#426)\r\n\r\n* fix openfoam_singularity issues\r\n\r\n* update requirements and descriptions for openfoam examples\r\n\r\n* bugfix/output-path-substitution (#430)\r\n\r\n* fix bug with output_path and variable substitution\r\n\r\n* add tests for cli substitutions\r\n\r\n* bugfix/scheduler-permission-error (#436)\r\n\r\n* Release/1.10.2 (#437)\r\n\r\n* bump version to 1.10.2\r\n\r\n* bump version in CHANGELOG\r\n\r\n* resolve develop to main merge issues (#439)\r\n\r\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* dependabot/certifi-requests-pygments (#441)\r\n\r\n* Bump certifi from 2022.12.7 to 2023.7.22 in /docs\r\n\r\nBumps [certifi](https://github.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22.\r\n- [Commits](https://github.com/certifi/python-certifi/compare/2022.12.07...2023.07.22)\r\n\r\n---\r\nupdated-dependencies:\r\n- dependency-name: certifi\r\n dependency-type: direct:production\r\n...\r\n\r\nSigned-off-by: dependabot[bot] \r\n\r\n* add all dependabot changes and update CHANGELOG\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* bugfix/server-pip-redis-conf (#443)\r\n\r\n* add *.conf to the MANIFEST file so pip will grab the redis.conf file\r\n\r\n* add note explaining how to fix a hanging merlin server start\r\n\r\n* modify CHANGELOG\r\n\r\n* add second export option to docs and fix typo\r\n\r\n* bump to version 1.10.3 (#444)\r\n\r\n* bugfix/sphinx-5.3.0-requirement (#446)\r\n\r\n* Version/1.10.3 (#445)\r\n\r\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* Bugfix/filename-special-vars (#425)\r\n\r\n* fix file naming bug\r\n\r\n* fix filename bug with variable as study name\r\n\r\n* add tests for the file name special vars changes\r\n\r\n* modify changelog\r\n\r\n* implement Luc's suggestions\r\n\r\n* remove replace line\r\n\r\n* Create dependabot-changelog-updater.yml\r\n\r\n* testing outputs of modifying changelog\r\n\r\n* delete dependabot-changelog-updater\r\n\r\n* feature/pdf-docs (#427)\r\n\r\n* first attempt at adding pdf\r\n\r\n* fixing build error\r\n\r\n* modify changelog to show docs changes\r\n\r\n* fix errors Luc found in the build logs\r\n\r\n* trying out removal of latex\r\n\r\n* reverting latex changes back\r\n\r\n* uncommenting the latex_elements settings\r\n\r\n* adding epub to see if latex will build\r\n\r\n* adding a latex engine variable to conf\r\n\r\n* fix naming error with latex_engine\r\n\r\n* attempting to add a logo to the pdf build\r\n\r\n* testing an override to the searchtools file\r\n\r\n* revert back to not using searchtools override\r\n\r\n* update changelog\r\n\r\n* bugfix/openfoam_singularity_issues (#426)\r\n\r\n* fix openfoam_singularity issues\r\n\r\n* update requirements and descriptions for openfoam examples\r\n\r\n* bugfix/output-path-substitution (#430)\r\n\r\n* fix bug with output_path and variable substitution\r\n\r\n* add tests for cli substitutions\r\n\r\n* bugfix/scheduler-permission-error (#436)\r\n\r\n* Release/1.10.2 (#437)\r\n\r\n* bump version to 1.10.2\r\n\r\n* bump version in CHANGELOG\r\n\r\n* resolve develop to main merge issues (#439)\r\n\r\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* dependabot/certifi-requests-pygments (#441)\r\n\r\n* Bump certifi from 2022.12.7 to 2023.7.22 in /docs\r\n\r\nBumps [certifi](https://github.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22.\r\n- [Commits](https://github.com/certifi/python-certifi/compare/2022.12.07...2023.07.22)\r\n\r\n---\r\nupdated-dependencies:\r\n- dependency-name: certifi\r\n dependency-type: direct:production\r\n...\r\n\r\nSigned-off-by: dependabot[bot] \r\n\r\n* add all dependabot changes and update CHANGELOG\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* bugfix/server-pip-redis-conf (#443)\r\n\r\n* add *.conf to the MANIFEST file so pip will grab the redis.conf file\r\n\r\n* add note explaining how to fix a hanging merlin server start\r\n\r\n* modify CHANGELOG\r\n\r\n* add second export option to docs and fix typo\r\n\r\n* bump to version 1.10.3 (#444)\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* change hardcoded sphinx requirement\r\n\r\n* update CHANGELOG\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* feature/vlauncher (#447)\r\n\r\n* fix file naming error for iterative workflows\r\n\r\n* fixed small bug with new filepath naming\r\n\r\n* add VLAUNCHER functionality\r\n\r\n* add docs for VLAUNCHER and modify changelog\r\n\r\n* re-word docs and fix table format\r\n\r\n* add a test for vlauncher\r\n\r\n* run fix-style and add a test for vlauncher\r\n\r\n* Add the find_vlaunch_var and setup_vlaunch functions.\r\nThe numeric value of the shell variables may not be defined until run\r\ntime, so replace with variable strings instead of values.\r\nConsolidate the commands into one function.\r\n\r\n* Add variable set for (t)csh.\r\n\r\n* Run fix-style\r\n\r\n* make step settings the defaults and ignore commented lines\r\n\r\n* add some additional tests\r\n\r\n* remove regex library import\r\n\r\n---------\r\n\r\nCo-authored-by: Joseph M. Koning \r\n\r\n* release/1.11.0 (#448)\r\n\r\n* bugfix/skewed-sample-hierarchy (#450)\r\n\r\n* add patch for skewed sample hierarchy/additional samples\r\n\r\n* update changelog\r\n\r\n* catch narrower range of exceptions\r\n\r\n* bugfix/lsf-gpu-typo (#453)\r\n\r\n* fix typo in batch.py that causes a bug\r\n\r\n* change print statements to log statements\r\n\r\n* release/1.11.1 (#454)\r\n\r\n* Add Pytest Fixtures to Test Suite (#456)\r\n\r\n* begin work on integration refactor; create fixtures and initial tests\r\n\r\n* update CHANGELOG and run fix-style\r\n\r\n* add pytest fixtures and README explaining them\r\n\r\n* add tests to demonstrate how to use the fixtures\r\n\r\n* move/rename some files and modify integration's README\r\n\r\n* add password change to redis.pass file\r\n\r\n* fix lint issues\r\n\r\n* modify redis pwd for test server to be constant for each test\r\n\r\n* fix lint issue only caught on github ci\r\n\r\n* Bugfix for WEAVE CI (#457)\r\n\r\n* begin work on integration refactor; create fixtures and initial tests\r\n\r\n* update CHANGELOG and run fix-style\r\n\r\n* add pytest fixtures and README explaining them\r\n\r\n* add tests to demonstrate how to use the fixtures\r\n\r\n* move/rename some files and modify integration's README\r\n\r\n* add password change to redis.pass file\r\n\r\n* fix lint issues\r\n\r\n* modify redis pwd for test server to be constant for each test\r\n\r\n* fix lint issue only caught on github ci\r\n\r\n* add fix for merlin server startup\r\n\r\n* update CHANGELOG\r\n\r\n* bugfix/monitor-shutdown (#452)\r\n\r\n* add celery query to see if workers still processing tasks\r\n\r\n* fix merlin status when using redis as broker\r\n\r\n* fix consumer count bug and run fix-style\r\n\r\n* fix linter issues\r\n\r\n* update changelog\r\n\r\n* update docs for monitor\r\n\r\n* remove unused exception I previously added\r\n\r\n* first attempt at using pytest fixtures for monitor tests\r\n\r\n* (partially) fix launch_workers fixture so it can be used in multiple classes\r\n\r\n* fix linter issues and typo on pytest decorator\r\n\r\n* update black's python version and fix style issue\r\n\r\n* remove print statements from celeryadapter.py\r\n\r\n* workers manager is now allowed to be used as a context manager\r\n\r\n* add one thing to changelog and remove print statement\r\n\r\n* Add the missing restart keyword to the specification docs. (#459)\r\n\r\n* docs/conversion-to-mkdocs (#460)\r\n\r\n* remove a merge conflict statement that was missed\r\n\r\n* add base requirements for mkdocs\r\n\r\n* set up configuration for API docs\r\n\r\n* start work on porting user guide to mkdocs\r\n\r\n* add custom styling and contact page\r\n\r\n* begin work on porting tutorial to mkdocs\r\n\r\n* add new examples page\r\n\r\n* move old sphinx docs to their own folder (*delete later*)\r\n\r\n* modify some admonitions to be success\r\n\r\n* modify hello examples page and port step 3 of tutorial to mkdocs\r\n\r\n* fix typo in hello example\r\n\r\n* finish porting step 4 of tutorial to mkdocs\r\n\r\n* port part 5 of the tutorial to mkdocs\r\n\r\n* copy faq and contributing from old docs\r\n\r\n* port step 6 of tutorial to mkdocs\r\n\r\n* remove unused prereq\r\n\r\n* port step 7 of tutorial to mkdocs\r\n\r\n* add more detailed instructions on contributing\r\n\r\n* move venv page into installation and add spack instructions too\r\n\r\n* add configuration docs\r\n\r\n* add content to user guide landing page\r\n\r\n* port celery page to mkdocs\r\n\r\n* rearrange configuration pages to add in merlin server configuration instructions\r\n\r\n* port command line page to mkdocs\r\n\r\n* finish new landing page\r\n\r\n* change size of merlin logo\r\n\r\n* port variables page to mkdocs\r\n\r\n* fix broken links to configuration page\r\n\r\n* port FAQ to mkdocs\r\n\r\n* fix incorrect requirement name\r\n\r\n* update CHANGELOG\r\n\r\n* attempt to get docs to build through readthedocs\r\n\r\n* port docker page to mkdocs\r\n\r\n* port contributing guide to mkdocs\r\n\r\n* add new 'running studies' page\r\n\r\n* add path changes to images\r\n\r\n* add a page on how to interpret study output\r\n\r\n* add page on the spec file\r\n\r\n* remove old sphinx docs that are no longer needed\r\n\r\n* added README to docs and updated CHANGELOG\r\n\r\n* fix copyright and hello_samples tree\r\n\r\n* rearrange images/stylesheets and statements that use them\r\n\r\n* add suggestions from Luc and Joe\r\n\r\n* add tcsh instructions for venv activation\r\n\r\n* add Charle's suggestions for the landing page\r\n\r\n* change tcsh mentions to csh\r\n\r\n* openfoam tutorial modifications (#463)\r\n\r\n* feature/revamped status (#464)\r\n\r\n* feature/new-status (#442)\r\n\r\n* add backend functionality for merlin status\r\n\r\n* add frontend functionality for merlin status\r\n\r\n* add tests for merlin status\r\n\r\n* run fix-style and remove import of deprecated function\r\n\r\n* update CHANGELOG\r\n\r\n* add more logging statements, make better use of glob\r\n\r\n* run fix-style\r\n\r\n* clean up test files a bit\r\n\r\n* fix test suite after step_name_map mod\r\n\r\n* add avg/std dev run time calculations to status\r\n\r\n* modify status tests to accommodate new avg/std dev calculations\r\n\r\n* fix linter issues\r\n\r\n* fix lint issue and add test for avg/std dev calc\r\n\r\n* feature/detailed-status (#451)\r\n\r\n* Version/1.11.0 (#449)\r\n\r\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* Bugfix/filename-special-vars (#425)\r\n\r\n* fix file naming bug\r\n\r\n* fix filename bug with variable as study name\r\n\r\n* add tests for the file name special vars changes\r\n\r\n* modify changelog\r\n\r\n* implement Luc's suggestions\r\n\r\n* remove replace line\r\n\r\n* Create dependabot-changelog-updater.yml\r\n\r\n* testing outputs of modifying changelog\r\n\r\n* delete dependabot-changelog-updater\r\n\r\n* feature/pdf-docs (#427)\r\n\r\n* first attempt at adding pdf\r\n\r\n* fixing build error\r\n\r\n* modify changelog to show docs changes\r\n\r\n* fix errors Luc found in the build logs\r\n\r\n* trying out removal of latex\r\n\r\n* reverting latex changes back\r\n\r\n* uncommenting the latex_elements settings\r\n\r\n* adding epub to see if latex will build\r\n\r\n* adding a latex engine variable to conf\r\n\r\n* fix naming error with latex_engine\r\n\r\n* attempting to add a logo to the pdf build\r\n\r\n* testing an override to the searchtools file\r\n\r\n* revert back to not using searchtools override\r\n\r\n* update changelog\r\n\r\n* bugfix/openfoam_singularity_issues (#426)\r\n\r\n* fix openfoam_singularity issues\r\n\r\n* update requirements and descriptions for openfoam examples\r\n\r\n* bugfix/output-path-substitution (#430)\r\n\r\n* fix bug with output_path and variable substitution\r\n\r\n* add tests for cli substitutions\r\n\r\n* bugfix/scheduler-permission-error (#436)\r\n\r\n* Release/1.10.2 (#437)\r\n\r\n* bump version to 1.10.2\r\n\r\n* bump version in CHANGELOG\r\n\r\n* resolve develop to main merge issues (#439)\r\n\r\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* dependabot/certifi-requests-pygments (#441)\r\n\r\n* Bump certifi from 2022.12.7 to 2023.7.22 in /docs\r\n\r\nBumps [certifi](https://github.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22.\r\n- [Commits](https://github.com/certifi/python-certifi/compare/2022.12.07...2023.07.22)\r\n\r\n---\r\nupdated-dependencies:\r\n- dependency-name: certifi\r\n dependency-type: direct:production\r\n...\r\n\r\nSigned-off-by: dependabot[bot] \r\n\r\n* add all dependabot changes and update CHANGELOG\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* bugfix/server-pip-redis-conf (#443)\r\n\r\n* add *.conf to the MANIFEST file so pip will grab the redis.conf file\r\n\r\n* add note explaining how to fix a hanging merlin server start\r\n\r\n* modify CHANGELOG\r\n\r\n* add second export option to docs and fix typo\r\n\r\n* bump to version 1.10.3 (#444)\r\n\r\n* bugfix/sphinx-5.3.0-requirement (#446)\r\n\r\n* Version/1.10.3 (#445)\r\n\r\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* Bugfix/filename-special-vars (#425)\r\n\r\n* fix file naming bug\r\n\r\n* fix filename bug with variable as study name\r\n\r\n* add tests for the file name special vars changes\r\n\r\n* modify changelog\r\n\r\n* implement Luc's suggestions\r\n\r\n* remove replace line\r\n\r\n* Create dependabot-changelog-updater.yml\r\n\r\n* testing outputs of modifying changelog\r\n\r\n* delete dependabot-changelog-updater\r\n\r\n* feature/pdf-docs (#427)\r\n\r\n* first attempt at adding pdf\r\n\r\n* fixing build error\r\n\r\n* modify changelog to show docs changes\r\n\r\n* fix errors Luc found in the build logs\r\n\r\n* trying out removal of latex\r\n\r\n* reverting latex changes back\r\n\r\n* uncommenting the latex_elements settings\r\n\r\n* adding epub to see if latex will build\r\n\r\n* adding a latex engine variable to conf\r\n\r\n* fix naming error with latex_engine\r\n\r\n* attempting to add a logo to the pdf build\r\n\r\n* testing an override to the searchtools file\r\n\r\n* revert back to not using searchtools override\r\n\r\n* update changelog\r\n\r\n* bugfix/openfoam_singularity_issues (#426)\r\n\r\n* fix openfoam_singularity issues\r\n\r\n* update requirements and descriptions for openfoam examples\r\n\r\n* bugfix/output-path-substitution (#430)\r\n\r\n* fix bug with output_path and variable substitution\r\n\r\n* add tests for cli substitutions\r\n\r\n* bugfix/scheduler-permission-error (#436)\r\n\r\n* Release/1.10.2 (#437)\r\n\r\n* bump version to 1.10.2\r\n\r\n* bump version in CHANGELOG\r\n\r\n* resolve develop to main merge issues (#439)\r\n\r\n* fix default worker bug with all steps\r\n\r\n* version bump and requirements fix\r\n\r\n* dependabot/certifi-requests-pygments (#441)\r\n\r\n* Bump certifi from 2022.12.7 to 2023.7.22 in /docs\r\n\r\nBumps [certifi](https://github.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22.\r\n- [Commits](https://github.com/certifi/python-certifi/compare/2022.12.07...2023.07.22)\r\n\r\n---\r\nupdated-dependencies:\r\n- dependency-name: certifi\r\n dependency-type: direct:production\r\n...\r\n\r\nSigned-off-by: dependabot[bot] \r\n\r\n* add all dependabot changes and update CHANGELOG\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* bugfix/server-pip-redis-conf (#443)\r\n\r\n* add *.conf to the MANIFEST file so pip will grab the redis.conf file\r\n\r\n* add note explaining how to fix a hanging merlin server start\r\n\r\n* modify CHANGELOG\r\n\r\n* add second export option to docs and fix typo\r\n\r\n* bump to version 1.10.3 (#444)\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* change hardcoded sphinx requirement\r\n\r\n* update CHANGELOG\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\n\r\n* feature/vlauncher (#447)\r\n\r\n* fix file naming error for iterative workflows\r\n\r\n* fixed small bug with new filepath naming\r\n\r\n* add VLAUNCHER functionality\r\n\r\n* add docs for VLAUNCHER and modify changelog\r\n\r\n* re-word docs and fix table format\r\n\r\n* add a test for vlauncher\r\n\r\n* run fix-style and add a test for vlauncher\r\n\r\n* Add the find_vlaunch_var and setup_vlaunch functions.\r\nThe numeric value of the shell variables may not be defined until run\r\ntime, so replace with variable strings instead of values.\r\nConsolidate the commands into one function.\r\n\r\n* Add variable set for (t)csh.\r\n\r\n* Run fix-style\r\n\r\n* make step settings the defaults and ignore commented lines\r\n\r\n* add some additional tests\r\n\r\n* remove regex library import\r\n\r\n---------\r\n\r\nCo-authored-by: Joseph M. Koning \r\n\r\n* release/1.11.0 (#448)\r\n\r\n* bugfix/skewed-sample-hierarchy (#450)\r\n\r\n* add patch for skewed sample hierarchy/additional samples\r\n\r\n* update changelog\r\n\r\n* catch narrower range of exceptions\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\nCo-authored-by: Joseph M. Koning \r\n\r\n* add functionality for the detailed-status command\r\n\r\n* add tests for detailed-status\r\n\r\n* fix linter issues\r\n\r\n* update changelog\r\n\r\n* general cleanup and add log statements\r\n\r\n* slightly modify two tests\r\n\r\n* default status renderer now uses json status format\r\n\r\n* remove inaccurate comment\r\n\r\n* bugfix/lsf-gpu-typo (#453)\r\n\r\n* fix typo in batch.py that causes a bug\r\n\r\n* change print statements to log statements\r\n\r\n* release/1.11.1 (#454)\r\n\r\n* Add Pytest Fixtures to Test Suite (#456)\r\n\r\n* begin work on integration refactor; create fixtures and initial tests\r\n\r\n* update CHANGELOG and run fix-style\r\n\r\n* add pytest fixtures and README explaining them\r\n\r\n* add tests to demonstrate how to use the fixtures\r\n\r\n* move/rename some files and modify integration's README\r\n\r\n* add password change to redis.pass file\r\n\r\n* fix lint issues\r\n\r\n* modify redis pwd for test server to be constant for each test\r\n\r\n* fix lint issue only caught on github ci\r\n\r\n* Bugfix for WEAVE CI (#457)\r\n\r\n* begin work on integration refactor; create fixtures and initial tests\r\n\r\n* update CHANGELOG and run fix-style\r\n\r\n* add pytest fixtures and README explaining them\r\n\r\n* add tests to demonstrate how to use the fixtures\r\n\r\n* move/rename some files and modify integration's README\r\n\r\n* add password change to redis.pass file\r\n\r\n* fix lint issues\r\n\r\n* modify redis pwd for test server to be constant for each test\r\n\r\n* fix lint issue only caught on github ci\r\n\r\n* add fix for merlin server startup\r\n\r\n* update CHANGELOG\r\n\r\n* bugfix/monitor-shutdown (#452)\r\n\r\n* add celery query to see if workers still processing tasks\r\n\r\n* fix merlin status when using redis as broker\r\n\r\n* fix consumer count bug and run fix-style\r\n\r\n* fix linter issues\r\n\r\n* update changelog\r\n\r\n* update docs for monitor\r\n\r\n* remove unused exception I previously added\r\n\r\n* first attempt at using pytest fixtures for monitor tests\r\n\r\n* (partially) fix launch_workers fixture so it can be used in multiple classes\r\n\r\n* fix linter issues and typo on pytest decorator\r\n\r\n* update black's python version and fix style issue\r\n\r\n* remove print statements from celeryadapter.py\r\n\r\n* workers manager is now allowed to be used as a context manager\r\n\r\n* add one thing to changelog and remove print statement\r\n\r\n* Add the missing restart keyword to the specification docs. (#459)\r\n\r\n* add Jeremy's suggestion to change vars option to output-path\r\n\r\n* remove unnecessary lines from CHANGELOG\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\nCo-authored-by: Joseph M. Koning \r\nCo-authored-by: Joe Koning \r\n\r\n* feature/queue info (#461)\r\n\r\n* remove a merge conflict statement that was missed\r\n\r\n* add queue-info functionality\r\n\r\n* add tests for queue-info\r\n\r\n* update CHANGELOG\r\n\r\n* add try/except for forceful termination of test workers\r\n\r\n* change github workflow to use py38 with black instead of py36\r\n\r\n* run fix-style with py 3.12 and fix a typo in a test\r\n\r\n* add filetype check for dump option\r\n\r\n* add banner print statement\r\n\r\n* docs/revamped status (#462)\r\n\r\n* fix broken image link in README\r\n\r\n* add new commands to the command line page\r\n\r\n* add monitoring docs layout and complete status cmds page\r\n\r\n* fix bug with dumping queue-info to files\r\n\r\n* add docs for queue-info\r\n\r\n* add documentation for 'query-workers'\r\n\r\n* add reference to new query-workers docs and split a paragraph\r\n\r\n* fix small bug with --steps option of monitor\r\n\r\n* add documentation for monitor command\r\n\r\n* update CHANGELOG\r\n\r\n* fix dump-csv image for queue-info\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\nCo-authored-by: Joseph M. Koning \r\nCo-authored-by: Joe Koning \r\n\r\n* release/1.12.0 (#465)\r\n\r\n* remove a merge conflict statement that was missed\r\n\r\n* bump version to 1.12.0\r\n\r\n* feature/retry_priority (#468)\r\n\r\n* remove a merge conflict statement that was missed\r\n\r\n* add a 'pip freeze' call in github workflow to view reqs versions\r\n\r\n* add new retry priority as highest task priority\r\n\r\n* update CHANGELOG\r\n\r\n* add in MID priority\r\n\r\n* change default priority to use priority map MID value\r\n\r\n* docs/server-cross-node (#470)\r\n\r\n* remove a merge conflict statement that was missed\r\n\r\n* add a 'pip freeze' call in github workflow to view reqs versions\r\n\r\n* rename the merlin server config page\r\n\r\n* add instructions for running a cross-node workflow w/ containerized server\r\n\r\n* update CHANGELOG\r\n\r\n* bugfix/initial-status-issues (#471)\r\n\r\n* remove a merge conflict statement that was missed\r\n\r\n* add a 'pip freeze' call in github workflow to view reqs versions\r\n\r\n* fix bug with dry run status\r\n\r\n* set MANPAGER for detailed-status\r\n\r\n* fix bug with 1 sample removing the status file\r\n\r\n* add support for multiple workers on one step in status files\r\n\r\n* update test suite to accommodate changes to workers in status files\r\n\r\n* add catch and potential fix for JSONDecodeError\r\n\r\n* fix docstring of a test\r\n\r\n* update CHANGELOG.md\r\n\r\n* run fix style and add Luc's suggestions\r\n\r\n* run fix-style with python 3.12\r\n\r\n* added additional check for status file while condensing\r\n\r\n* add try/except to catch an error for dumping statuses\r\n\r\n* release/1.12.1 (#472)\r\n\r\n* remove a merge conflict statement that was missed\r\n\r\n* add a 'pip freeze' call in github workflow to view reqs versions\r\n\r\n* bump version to 1.12.1\r\n\r\n* fix a lint issue that somehow slipped through the cracks\r\n\r\n---------\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>\r\nCo-authored-by: Joseph M. Koning \r\nCo-authored-by: Joe Koning \r\nCo-authored-by: Jane Herriman ","shortMessageHtmlLink":"Version/1.12.1 (#473)"}},{"before":"4a078001684eadfdaf016886a536cf83046e6d31","after":"bba68abba4fdf425c638163b79004afe2518915b","ref":"refs/heads/develop","pushedAt":"2024-04-16T00:46:04.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"fix a lint issue that somehow slipped through the cracks","shortMessageHtmlLink":"fix a lint issue that somehow slipped through the cracks"}}],"hasNextPage":true,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAAEUzrpgAA","startCursor":null,"endCursor":null}},"title":"Activity · LLNL/merlin"}