Deployed version as on 31.08.2020 on xcal
Merge request reports
Activity
mentioned in merge request !335 (merged)
- webservice/sqlite_view.py 0 → 100644
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) 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
1 import yaml 1 2 import argparse 2 3 3 4 from metadata_client.metadata_client import MetadataClient 4 import yaml changed this line in version 4 of the diff
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
added 59 commits
-
877d0abe...92a3d7a6 - 56 commits from branch
master
- 9cdfefb7 - Deployed version as on 31.08.2020 on xcal
- 6a417b1a - update cal_db_interactive
- ffc390ef - resolve conflicts
Toggle commit list-
877d0abe...92a3d7a6 - 56 commits from branch
added 1 commit
- 8fd681d3 - update sqlite_view + concurrent range for jf
added 1 commit
- 94c0205c - update sqlite_view + concurrent range for jf
mentioned in commit 485a9a45