Code

refactor/status#431

Code

Closed

bgunnar5 wants to merge 76 commits intoLLNL:developLLNL/merlin:developfrom bgunnar5:refactor/statusbgunnar5/merlin:refactor/statusCopy head branch name to clipboard

+8,509-298

Commits

Commits on Jan 19, 2023

• fix error for user with gpus per task field

  bgunnar5

  committed
  67fd6d2

  Copy full SHA for 67fd6d2

Commits on Jan 20, 2023

• begin work on merlin status changes

  bgunnar5

  committed
  5f8a593

  Copy full SHA for 5f8a593

Commits on Jan 24, 2023

• fix issue with --spec flag on stop-workers cmd

  bgunnar5

  committed
  189fb43

  Copy full SHA for 189fb43

• all flags for stop-workers now work and added ignores for e2e test output folders

  bgunnar5

  committed
  705fcd8

  Copy full SHA for 705fcd8

• add ability to print queue info with --queues flag on merlin info cmd

  bgunnar5

  committed
  6ced784

  Copy full SHA for 6ced784

• Merge branch 'main' of https://github.com/bgunnar5/merlin into refactor/status

  bgunnar5

  committed
  db4787d

  Copy full SHA for db4787d

• modify CHANGELOG

  bgunnar5

  committed
  2b2c699

  Copy full SHA for 2b2c699

Commits on Jan 25, 2023

• move current merlin status to merlin info --queues

  bgunnar5

  committed
  2a0d7d4

  Copy full SHA for 2a0d7d4

Commits on Jan 30, 2023

• add MERLIN_STATUS file and begin work on status updating

  bgunnar5

  committed
  bd97b46

  Copy full SHA for bd97b46

Commits on Feb 7, 2023

• update certain cmds to use queue_tag rather than hard coded value

  bgunnar5

  committed
  5b5395b

  Copy full SHA for 5b5395b

Commits on Feb 10, 2023

• refactor worker launch process & create dedicated status worker launch

  bgunnar5

  committed
  0c27397

  Copy full SHA for 0c27397

Commits on Mar 1, 2023

• added mapping getters to MerlinSpec object

  bgunnar5

  committed
  cd060e1

  Copy full SHA for cd060e1

• pass study name through to Step object

  bgunnar5

  committed
  0f2583e

  Copy full SHA for 0f2583e

• create new celery task to update statuses

  bgunnar5

  committed
  c274714

  Copy full SHA for c274714

Commits on Mar 2, 2023

• groundwork for displaying the status of a study

  bgunnar5

  committed
  e81f279

  Copy full SHA for e81f279

• modify changelog for status revamp and add myself as a contributor

  bgunnar5

  committed
  6dc1422

  Copy full SHA for 6dc1422

Commits on Apr 15, 2023

• merge in changes from 1.10.0 release

  bgunnar5

  committed
  7dafe61

  Copy full SHA for 7dafe61

Commits on Apr 28, 2023

• allow for prompt-less low lvl display

  bgunnar5

  committed
  bb84b34

  Copy full SHA for bb84b34

• majority of the work for condensing status files

  bgunnar5

  committed
  ff687b9

  Copy full SHA for ff687b9

• resolve an issue after rebasing

  bgunnar5

  committed
  284a622

  Copy full SHA for 284a622

• fix merge conflict

  bgunnar5

  committed
  b58a9f8

  Copy full SHA for b58a9f8

Commits on May 3, 2023

• add color blind assistance

  bgunnar5

  committed
  25b3335

  Copy full SHA for 25b3335

Commits on May 4, 2023

• add docs for new status command

  bgunnar5

  committed
  f63271b

  Copy full SHA for f63271b

Commits on May 9, 2023

• add status support for local runs

  bgunnar5

  committed
  1fbd910

  Copy full SHA for 1fbd910

Commits on May 11, 2023

• refactor file condensing to remove filelocks

  bgunnar5

  committed
  8bc020b

  Copy full SHA for 8bc020b

• refactor some status flags/display code

  bgunnar5

  committed
  3a7a522

  Copy full SHA for 3a7a522

Commits on May 12, 2023

• add ability to dump status to csv

  bgunnar5

  committed
  884945a

  Copy full SHA for 884945a

Commits on May 24, 2023

• add ability to dump to json and create Dumper object

  bgunnar5

  committed
  6929808

  Copy full SHA for 6929808

• add documentation for dumping status

  bgunnar5

  committed
  95694dc

  Copy full SHA for 95694dc

Commits on Jun 19, 2023

• integrate Maestro's display using the rich library

  bgunnar5

  committed
  a8e500c

  Copy full SHA for a8e500c

Commits on Jun 21, 2023

• add filter by return code functionality

  bgunnar5

  committed
  f4496b4

  Copy full SHA for f4496b4

Commits on Jun 22, 2023

• add filelocks to status condensing and fix celery warning

  bgunnar5

  committed
  cfe4479

  Copy full SHA for cfe4479

• shift old status to queue-info and add some additional functionality to it

  bgunnar5

  committed
  ecddb49

  Copy full SHA for ecddb49

Commits on Jul 5, 2023

• switch status to OOP and from .txt to .json files

  bgunnar5

  committed
  591b398

  Copy full SHA for 591b398

Commits on Jul 6, 2023

• run fix-style and fix flake8 issues

  bgunnar5

  committed
  333d733

  Copy full SHA for 333d733

• re-order command output in docs for status

  bgunnar5

  committed
  8339ea5

  Copy full SHA for 8339ea5

• fix CHANGELOG conflicts from merge with develop

  bgunnar5

  committed
  856bcea

  Copy full SHA for 856bcea

• fix pylint errors with new changes

  bgunnar5

  committed
  cb87588

  Copy full SHA for cb87588

Commits on Jul 7, 2023

• fix an issue with race conditions when condensing status files

  bgunnar5

  committed
  85f4b06

  Copy full SHA for 85f4b06

• fix issue with output path when running from another dir

  bgunnar5

  committed
  34d074d

  Copy full SHA for 34d074d

Commits on Jul 11, 2023

• split status command into two arguments

  bgunnar5

  committed
  9ac7f77

  Copy full SHA for 9ac7f77

• fix error with replace that was breaking tests

  bgunnar5

  committed
  6060fb5

  Copy full SHA for 6060fb5

• fix merge conflict when pulling from develop

  bgunnar5

  committed
  f60df9b

  Copy full SHA for f60df9b

Commits on Jul 12, 2023

• clean up unused code and comments

  bgunnar5

  committed
  7b6ba46

  Copy full SHA for 7b6ba46

• update CHANGELOG

  bgunnar5

  committed
  f600163

  Copy full SHA for f600163

Commits on Jul 13, 2023

• minor fixes and log additions

  bgunnar5

  committed
  bc8fb9a

  Copy full SHA for bc8fb9a

• fix lint errors

  bgunnar5

  committed
  93d6f40

  Copy full SHA for 93d6f40

• add docs for status, detailed-status, and queue-info commands

  bgunnar5

  committed
  cb82e1f

  Copy full SHA for cb82e1f

Commits on Jul 20, 2023

• add Jeremy's suggestions and some stuff to help with testing status

  bgunnar5

  committed
  8c9eeca

  Copy full SHA for 8c9eeca

• add tests for merlin status

  bgunnar5

  committed
  0b1f8ec

  Copy full SHA for 0b1f8ec

Commits on Jul 25, 2023

• add detailed-status tests

  bgunnar5

  committed
  1dc6108

  Copy full SHA for 1dc6108

• first attempt at getting pytest to work

  bgunnar5

  committed
  bfee1b3

  Copy full SHA for bfee1b3

• fix pylint issue with detailed-status tests and add copyright message to test files

  bgunnar5

  committed
  bed7b68

  Copy full SHA for bed7b68

• reformat json files in test library

  bgunnar5

  committed
  053ef31

  Copy full SHA for 053ef31

Commits on Jul 26, 2023

• reformat how parameters are stored in the status.json file

  bgunnar5

  committed
  80d6253

  Copy full SHA for 80d6253

• move dump test functionality to shared file

  bgunnar5

  committed
  8e535f3

  Copy full SHA for 8e535f3

• add dump tests with filters for detailed-status

  bgunnar5

  committed
  e04daf1

  Copy full SHA for e04daf1

• update docs to accommodate new status.json file renaming changes

  bgunnar5

  committed
  d1fd9ca

  Copy full SHA for d1fd9ca

• remove tabulate_info function to try to fix test problems

  bgunnar5

  committed
  84d43a3

  Copy full SHA for 84d43a3

• fix pylint issues with newest changes

  bgunnar5

  committed
  694d8f4

  Copy full SHA for 694d8f4

• second attempt at fixing tests on github

  bgunnar5

  committed
  60fc5d9

  Copy full SHA for 60fc5d9

• fix cyclic imports to hopefully fix github ci

  bgunnar5

  committed
  8c19c82

  Copy full SHA for 8c19c82

• moving broker/results_backend config imports inside functions

  bgunnar5

  committed
  015f71b

  Copy full SHA for 015f71b

• move another config import inside a function

  bgunnar5

  committed
  6e509fc

  Copy full SHA for 6e509fc

• first attempt at modifying dirname so github ci works

  bgunnar5

  committed
  a404c43

  Copy full SHA for a404c43

• add class setup/teardown to modify expanded yaml for status tests

  bgunnar5

  committed
  bb55e05

  Copy full SHA for bb55e05

• make csv dump test ignore the order of output

  bgunnar5

  committed
  1a2c476

  Copy full SHA for 1a2c476

Commits on Aug 14, 2023

• move queue-info related code from router to celeryadapter

  bgunnar5

  committed
  0f7bf0b

  Copy full SHA for 0f7bf0b

• add tests for queue-related functions in celeryadapter

  bgunnar5

  committed
  4ce11e1

  Copy full SHA for 4ce11e1

• update docs to accommodate --specification to --spec change

  bgunnar5

  committed
  fa4699b

  Copy full SHA for fa4699b

• update CHANGELOG

  bgunnar5

  committed
  b907adf

  Copy full SHA for b907adf

• merge v1.10.2 into this branch

  bgunnar5

  committed
  91384ba

  Copy full SHA for 91384ba

• small changes to wording in CHANGELOG

  bgunnar5

  committed
  af8bf04

  Copy full SHA for af8bf04

Commits on Aug 15, 2023

• change port used for unit tests redis server

  bgunnar5

  committed
  acba79e

  Copy full SHA for acba79e

Commits on Aug 17, 2023

• starting work on porting celeryadapter tests to integration suite

  bgunnar5

  committed
  2fd01d3

  Copy full SHA for 2fd01d3

• do some more conversion from unittest to pytest syntax

  bgunnar5

  committed
  645a444

  Copy full SHA for 645a444