Skip to content
Snippets Groups Projects

Assorted cleanup of xfel-calibrate

Merged Thomas Kluyver requested to merge clean-slurm-call into master
All threads resolved!

Description

Now that @roscar has added some tests for the CLI, I though I'd start cleaning up the code a bit. This is a combination of various minor changes, which I'll describe inline.

How Has This Been Tested?

Run xfel-calibrate from my account on Maxwell, checked that output files, report, details from Slurm are still produced in the output folder as before.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • Refactor (refactoring code with no functionality changes)

Checklist:

  • My code follows the code style of this project.

Reviewers

@roscar @ahmedk

Edited by Thomas Kluyver

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Thomas Kluyver
  • Thomas Kluyver added 1 commit

    added 1 commit

    • ba12f7b5 - No longer need to pass Slurm job ID to finalize script

    Compare with previous version

  • Thomas Kluyver
  • Thomas Kluyver
  • Thomas Kluyver added 1 commit

    added 1 commit

    • cc8c65c7 - Use keyword argument for finalize_script

    Compare with previous version

  • Thomas Kluyver added 1 commit

    added 1 commit

    • 1133e3b7 - Type hints say user_venv should be Path, not str

    Compare with previous version

  • Tests fail on CI, but pass when I run them locally...

  • Thomas Kluyver added 2 commits

    added 2 commits

    • a2403610 - Remove some unused imports
    • a9345b83 - finalize script goes in run_tmp_path

    Compare with previous version

  • I needed to reinstall. I guess I'm used to being able to test on the local version without installing it...

  • Thomas Kluyver added 1 commit

    added 1 commit

    Compare with previous version

  • Robert Rosca
  • LGTM :thumbsup:

    And with the wonders of git worktree I didn't even need to stash stuff to review this :sunglasses:

  • Thomas Kluyver added 1 commit

    added 1 commit

    • 11b41b3c - Apply suggestion to src/xfel_calibrate/finalize.py

    Compare with previous version

  • Thomas Kluyver added 1 commit

    added 1 commit

    Compare with previous version

  • Thomas Kluyver enabled an automatic merge when the pipeline for 09465fcb succeeds

    enabled an automatic merge when the pipeline for 09465fcb succeeds

  • Thomas Kluyver mentioned in commit fa2d8cad

    mentioned in commit fa2d8cad

  • Robert Rosca resolved all discussions

    resolved all discussions

  • Please register or sign in to reply
    Loading