Skip to content
Snippets Groups Projects

Deployed version as on 31.08.2020 on xcal

Merged Karim Ahmed requested to merge xcal_deployed into master
3 unresolved threads

This is the current version of pycalibration at xcal@max-exfl016. This was created as a merge request to check which changes were not yet propagated to master before and to later update master with these changes before the next proper deployment.

@kamile @danilevc

Edited by Karim Ahmed

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
2
3
4 file_path = "/home/xcal/calibration_webservice/webservice/webservice_jobs.sqlite"
5 run = '247'
6 proposal = '900138'
7
8
9 conn = sqlite3.connect(file_path)
10 c = conn.cursor()
11
12 c.execute("SELECT * FROM jobs")
13
14 for r in c.fetchall():
15 rid, jobid, db_proposal, db_run, status, time, _, _ = r
16 if db_proposal == proposal and db_run == run:
17 print(r)
  • Why is this file part of this MR? Is this file intended to be part of the various tools? If so, it should have documentation, and perhaps an entry point in the setup.py, with proper arguments.

  • it is a script we found in the production environment and we thought to include it in the master to have a track overall relevant changes from production.

    It wouldn't be included to setup.py as I can see that it is used as a script to review the status of SLURM jobs from the SQLite table.

    But indeed it needs multiple modifications. Documentation, exposing the input variable through a CLI, ..

    Edited by Karim Ahmed
  • Please register or sign in to reply
  • 1 import yaml
    1 2 import argparse
    2 3
    3 4 from metadata_client.metadata_client import MetadataClient
    4 import yaml
  • Karim Ahmed changed the description

    changed the description

    • I'm a bit confused about this MR.

      I see three types of changes:

      • Changes related to fixes due to updates;
      • Utilities being added;
      • Styling.

      I'm not sure what to prioritise. Is this a dump of the stuff that we need to keep and use a baseline, or should it be reviewed in details?

    • I have added this to the description to clear it up.

      This is the current version of pycalibration at xcal@max-exfl016. This was created as a merge request to check which changes were not yet propagated to master before and to later update master with these changes before the next proper deployment.

      Yes, this is just a dump of what is already is present at the package deployed. it needs to be reviewed in detail. some of these are fixes that have a different MR of the same changes, such as https://git.xfel.eu/gitlab/detectors/pycalibration/merge_requests/335, there are also other fixes which was not yet propagated and there are some utilities which we included here to review and modify and later include in the package.

      We did this dump of a branch and created a tag (2.8.7-temporary) of it and deployed it in xcal this week. as the master consists of many new features that we do not want to deploy yet in production.

      Edited by Karim Ahmed
    • Please register or sign in to reply
  • Ok, LGTM.
    Thanks for taking the time to talk me through it!

  • LGTM since only major changes are in AGIPD64K and PNCCD notebooks which are also tested during the beamtime and supposed to work.

  • Karim Ahmed added 59 commits

    added 59 commits

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    • 8fd681d3 - update sqlite_view + concurrent range for jf

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    • 94c0205c - update sqlite_view + concurrent range for jf

    Compare with previous version

  • Thank you for the review. I have reviewed as well the MR and there were some comments that I had and I added corresponding modifications.

    I will leave this MR till the end of tomorrow if any of you want to look at these modifications.

  • merged

  • Karim Ahmed mentioned in commit 485a9a45

    mentioned in commit 485a9a45

  • Please register or sign in to reply
    Loading