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.

Sign up for GitHub

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

Jump to bottom

[WIP] NNPDF data package #1965

Closed
wants to merge 14 commits into from
Closed

[WIP] NNPDF data package #1965

wants to merge 14 commits into from

Conversation

comane
Copy link
Member

@comane comane commented Feb 29, 2024

This PR addresses #1942

In this draft, the validphys/datafiles are moved into a directory nnpdf_data with it's own pyproject.toml.

@comane comane marked this pull request as draft February 29, 2024 20:18
@comane comane changed the title [WIP] Light data only package [WIP] NNPDF data package Feb 29, 2024
@scarlehoff
Copy link
Member

scarlehoff commented Mar 1, 2024 •
edited
Loading

Since we are removing after the tag C++/libnnpdf/evolven3fit the problems in the tests might be resolved by that.

@scarlehoff scarlehoff mentioned this pull request Mar 5, 2024
Merged
@scarlehoff
Copy link
Member

This looks good to me. The only thing is leave disp_theory.py in the vp/datafiles folder (we can deal with the theory later), let's do only data for now.
This is a good starting point tbh, if you apply the changes to current master we can have the stuff already in that folder in the root of the repository and then in a subsequent PR we create a specific package to install it separately from the rest of the code.

Eventually we can move the parser also there but that can be yet another pr.

@RoyStegeman RoyStegeman mentioned this pull request Mar 12, 2024
Closed
@comane comane marked this pull request as ready for review March 13, 2024 18:28
@comane comane force-pushed the light_data_only_package branch 2 times, most recently from 69d3007 to 7a91260 Compare March 13, 2024 21:25
scarlehoff and others added 12 commits March 13, 2024 21:26
@scarlehoff @comane
make the theorydb into a yamldb
13670ab 
Update validphys2/src/validphys/datafiles/disp_theory.py

Co-authored-by: Felix Hekhorn <felixhekhorn@users.noreply.github.com>

apply comments and rebase

cast explicitly as float
@scarlehoff @comane
exclude rawdata from the installation and include explicitly theory c…
d15c692 
…ards
@comane
moved validphys datafiles in nnpdf_data
407373a
@comane
removed validphys datafiles inclusion in pyproject.toml
eb929fb
@comane
added nnpdf_data as package
b1da3f5
@comane
validphys.datafiles imports --> nnpdf_data
5584503
@comane
move new commondata to nnpdf_data due to rebase
22c5905
@comane
move new commondata to nnpdf_data due to rebase
002726d
@comane
disp_theory.py and theory.db still reside in validphys/datafile
05f43b7
@comane
only disp_theory.py in validphys/datafiles + reportengine nnpdf_data …
5040e7e 
…dependency
@comane
added legacy_to_new_mapping back to loader
25dc717
@comane
python and ruamel.yaml as nnpdf_data dependencies
92e9a99
@scarlehoff
Copy link
Member

You probably want also to set a minimum version of ruamel to avoid the need for the compat module

@scarlehoff scarlehoff mentioned this pull request Mar 14, 2024
Merged
@comane comane mentioned this pull request Mar 15, 2024
Merged
@comane
Copy link
Member Author

comane commented Mar 15, 2024

Taken care of in #2009

@comane comane closed this Mar 15, 2024
@scarlehoff scarlehoff deleted the light_data_only_package branch March 17, 2024 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scarlehoff scarlehoff Awaiting requested review from scarlehoff

Assignees
No one assigned
Labels
nnpdf data package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@comane @scarlehoff