Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
92f7205
Add configs detection and load
alecandido Feb 11, 2022
aa225f2
Remove installation script
alecandido Feb 17, 2022
365e029
Add configs specification to CLI
alecandido Feb 17, 2022
0e962bf
Add non-overriding defaults for paths and commands
alecandido Feb 17, 2022
fd54195
Add Configurations object
alecandido Feb 18, 2022
f34809f
Remove paths, restore list subcommand
alecandido Feb 18, 2022
01f0890
Empty and remove paths module
alecandido Feb 18, 2022
ed6cf48
Fix update subcommands, and several paths import
alecandido Feb 18, 2022
f30e22f
Fix paths in installation
alecandido Feb 18, 2022
8c34363
Add results folder, separated from root
alecandido Feb 18, 2022
11fe721
Scope pineappl installation to mg5, not required for yadism
alecandido Feb 18, 2022
3861279
Fix converted lambdas
alecandido Feb 18, 2022
9e72a16
Fix mg5-related paths
alecandido Feb 18, 2022
2e1b5a9
Add check for lhapdf installation
alecandido Feb 18, 2022
044b37c
Drop configuration class
alecandido Mar 3, 2022
d557854
Add configs subcommand
alecandido Mar 3, 2022
4258d2c
Add command to retrieve serialized info
alecandido Mar 3, 2022
58ef76b
Provide information about dataset kind
alecandido Mar 3, 2022
bc5db38
Remove ./rr install instructions
alecandido Mar 3, 2022
5eedd8a
Add contribution guidelines, move some stuff out of README
alecandido Mar 3, 2022
9f2089e
Remove superseeded scripts
alecandido Mar 3, 2022
3eebb38
Update pineappl repo url protocol
alecandido Mar 19, 2022
e7c8fea
Move non-python dependencies list
alecandido Jun 1, 2022
31694e9
Update scipy intersphinx
alecandido Jun 1, 2022
ee4e2e3
Fix configs usage to dict style (new simplified style)
alecandido Jul 21, 2022
6714e37
Update versions of yadism, pineappl, and yaml
alecandido Jul 21, 2022
441ab29
Prune outdated, unmaintained zero-dependency script
alecandido Jul 22, 2022
0e2535e
Poetry update
alecandido Jul 22, 2022
95db07f
Simplify configs
alecandido Jul 22, 2022
e35f3d3
Remove prefixed
alecandido Jul 22, 2022
8d73078
Update .github/CONTRIBUTING.md
alecandido Jul 22, 2022
beee024
Add explanatory comment
alecandido Jul 22, 2022
123dd3f
Fix wrong use of setdefault
alecandido Jul 22, 2022
52b85df
Move info collection to a single source of truth
alecandido Jul 22, 2022
3084145
Add runcardsrunner version to those annotated
alecandido Jul 22, 2022
0fda593
Update runcardsrunner/configs.py
alecandido Jul 22, 2022
68ae28c
Return correct info for missing datasets
alecandido Jul 22, 2022
9028739
Document configs main functions
alecandido Jul 22, 2022
c70aa14
Use consistent naming scheme for constant
alecandido Jul 22, 2022
e43312c
Remove auto detection of system wide configs
alecandido Jul 22, 2022
410ef1b
Lift executable testing to global function
alecandido Jul 22, 2022
947bd38
Implement nested update, give up on dedicate scope update
alecandido Jul 23, 2022
5773ac9
Properly document the most simplified nested logic
alecandido Jul 23, 2022
b0d883f
Add note about chainmaps
alecandido Jul 23, 2022
18b053a
Resort defaults loading
alecandido Jul 23, 2022
4a790ff
Write configs default in configs example comments
alecandido Jul 23, 2022
74154cd
Add info subcommand, to inspect configs
alecandido Jul 23, 2022
f9e5479
Explain content of config file committed
alecandido Jul 23, 2022
0c5e370
Update runcardsrunner.toml
alecandido Jul 25, 2022
3214c40
Update runcardsrunner/info.py
alecandido Jul 25, 2022
50baf51
Lift LHAPDF version top-level
alecandido Jul 25, 2022
26a4d9b
Fix configs section for VRAP command
alecandido Jul 25, 2022
4b70540
Update yadism output
alecandido Jul 25, 2022
135e912
Simplify gitignore rule for results
alecandido Jul 25, 2022
cbf37ae
Update runcardsrunner.toml
alecandido Jul 25, 2022
cd0aa94
Update runcardsrunner.toml
alecandido Jul 25, 2022
bc9ffb8
Update runcardsrunner/configs.py
alecandido Jul 25, 2022
afef4f1
Make root always a path object
alecandido Jul 27, 2022
297589f
Use always root as basis for relative paths
alecandido Jul 27, 2022
f7a38dd
Remove remnant 'prefixed'
alecandido Jul 27, 2022
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
12 changes: 12 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## Dependencies

### More on tools

The `runcardsrunner` package is managed by `poetry`. This has been chosen to
automate a series of tasks, and to grant reproducible installations maintaining
a `poetry.lock` file.

It might happen (frequently) that `poetry` complains about version
dependencies, if inconsistent. This is not `poetry`'s fault, and it's a useful
warning that will prevent to just break when installed by an user with a
different environment.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.prefix/
# ignore any folder like '<DATASET>-YYYYMMDDHHmmss'
*-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/
results/
# madgraph junk
py.py
additional_command
Expand Down
38 changes: 9 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ There is no released version currently.

### Dev

For development the dependencies can be bootstrapped by running:
For development you need the following tools:

```sh
./rr install
```
- `poetry`, follow [installation
instructions](https://python-poetry.org/docs/#installation)
- `poetry-dynamic-versioning`, used to manage the version (see
[repo](https://github.com/mtkennerly/poetry-dynamic-versioning))
- `pre-commit`, to run maintenance hooks before commits (see
[instructions](https://pre-commit.com/#install))

See [below](#non-python-dependencies) for a few dependencies (already available
on most systems).
See [below](.github/CONTRIBUTING.md#non-python-dependencies) for a few more
dependencies (already available on most systems).

## Documentation

Expand All @@ -32,26 +35,3 @@ cd docs
make html
make view
```

### Non Python dependencies

Even if the bootstrap script and the installation management try to reduce as
much as possible the amount of dependencies, still a few ingredients have to be
available on the system.

To run `./rr install`:

- `python` itself
- `pip` available as a module of the `python` that is running `rr` (as usually
is)
- `curl`

To install `pineappl`:

- `pkg-config`
- `openssl.pc` (e.g. on Debian available in the `libssl-dev` package)

To install `mg5amc@nlo` and its dependencies:

- `gfortran`
- `wget`
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
# Thanks https://github.com/bskinn/sphobjinv
intersphinx_mapping = {
"python": ("https://docs.python.org/3/", None),
"scipy": ("https://docs.scipy.org/doc/scipy/reference", None),
"scipy": ("https://docs.scipy.org/doc/scipy", None),
"numpy": ("https://numpy.org/doc/stable", None),
"pygit2": ("https://www.pygit2.org/", None),
"pandas": ("https://pandas.pydata.org/docs/", None),
Expand Down
24 changes: 24 additions & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,30 @@ There are two ways of installing ``rr``, that are:
and in this case, ``rr`` to be used is always the one provided as executable.
in the repository.

Non Python dependencies
-----------------------

Even if the bootstrap script and the installation management try to reduce as
much as possible the amount of dependencies, still a few ingredients have to be
available on the system.

To run the CLI:

- ``python`` itself
- ``pip`` available as a module of the ``python`` that is running ``rr`` (as usually
is)
- ``curl``

To install ``pineappl``:

- ``pkg-config``
- ``openssl.pc`` (e.g. on Debian available in the ``libssl-dev`` package)

To install ``mg5amc@nlo`` and its dependencies:

- ``gfortran``
- ``wget``


.. toctree::
:maxdepth: 1
Expand Down
68 changes: 0 additions & 68 deletions merge_grids.sh

This file was deleted.

Loading