Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the ds list script so it works with the new gbasf2 version #210

Merged
merged 7 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,23 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Fixed

* **gbasf2**: Make gbasf2 wrapper work with gbasf2 release `v5.8.2`:
* **gbasf2**: Fixes to make gbasf2 wrapper work with gbasf2 release `v5.8.2`:
- Change the default gbasf2 setup script path to CVMFS location in gbasf2 v5.8.2, i.e.
```
/cvmfs/belle.kek.jp/grid/gbasf2/pro/bashrc
```
Reminder that this can still be customized via the `gbasf2_setup_path` setting.
[#207](https://github.com/nils-braun/b2luigi/pull/207)
- Fix script to get gbasf2 project status as JSON for latest gbasf2 release. [#209](https://github.com/nils-braun/b2luigi/pull/209) @eckerpatrick
- Fix to gbasf2-interacting scripts for querying project status and listing datasets. [#209](https://github.com/nils-braun/b2luigi/pull/209) @eckerpatrick and [#210](https://github.com/nils-braun/b2luigi/pull/210) @0ctagon.

* **gbasf2:** Fix `gbasf2_setup_path` setting not being passed through in some function calls. [#203](https://github.com/nils-braun/b2luigi/pull/203) @AlexanderHeidelbach

### Removed

* **gbasf2:** Fully deprecate `gbasf2_install_directory` setting. It will be ignored from now on and a warning given if used. Instead please use the `gbasf2_setup_path` setting introduced in v0.10.1 to provide the exact path to the gbasf2 setup script. `gbasf2_install_directory` will not be used as a fall-back anymore as was the case in v0.10.1.
* **gbasf2:** Fully deprecate `gbasf2_install_directory` setting. It will be ignored from now on and a warning given if used. Instead please use the `gbasf2_setup_path` setting introduced in v0.10.1 to provide the exact path to the gbasf2 setup script. `gbasf2_install_directory` will not be used as a fallback anymore as was the case in v0.10.1.

### New Contributors
* Tristan Fillinger @0ctagon

**Full Changelog**: https://github.com/nils-braun/b2luigi/compare/v0.10.1...main

Expand Down
4 changes: 3 additions & 1 deletion b2luigi/batch/processes/gbasf2_utils/gbasf2_ds_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
import json
import sys

from BelleDIRAC.Client.helpers.auth import userCreds
from BelleDIRAC.gbasf2.lib.auth import userCreds
from BelleDIRAC.Client.helpers.common import initializeCS
from BelleDIRAC.gbasf2.lib.ds.manager import Manager


Expand All @@ -33,5 +34,6 @@ def get_lfns(dataset, user):
parser.add_argument("--dataset", help="Dataset query.")
parser.add_argument("--user", help="DIRAC username.")
args = parser.parse_args()
initializeCS()
lfns = get_lfns(args.dataset, args.user)
print(json.dumps(lfns))
9 changes: 6 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,10 @@ Features, fixing, help and testing
* Matthias Schnepf (`mschnepf`_)
* Artur Gottmann (`ArturAkh`_)
* Caspar Schmitt (`schmitca`_)
* Marcel Hohmann (`MarcelHoh_`)
* Giacomo De Pietro (`GiacomoXT_`)
* Alex Heidelbach (`AlexanderHeidelbach_`)
* Marcel Hohmann (`MarcelHoh`_)
* Giacomo De Pietro (`GiacomoXT`_)
* Alex Heidelbach (`AlexanderHeidelbach`_)
* Tristan Fillinger (`0ctagon`_)

Stolen ideas
* Implementation of SGE batch system (`sge`_).
Expand All @@ -163,8 +164,10 @@ Stolen ideas
.. _`MarcelHoh`: https://github.com/MarcelHoh
.. _`GiacomoXT`: https://github.com/GiacomoXT
.. _`AlexanderHeidelbach`: https://github.com/AlexanderHeidelbach
.. _`0ctagon`: https://github.com/0ctagon
.. _`sge`: https://github.com/spotify/luigi/blob/master/luigi/contrib/sge.py
.. _`lsf`: https://github.com/spotify/luigi/pull/2373/files



.. [1] https://github.com/spotify/luigi/blob/master/luigi/contrib/sge.py