Merge pull request #226 from NNPDF/invert-mark-box-dep

Invert ekomark-ekobox dependency

doc/source/theory/DGLAP.rst

@@ -524,7 +524,7 @@ any longer and hence, they have to be rejoined with their evolution basis elemen
 part in the ordinary collinear evolution.
 
 Mixed |QCD| :math:`\otimes` |QED| evolution
------------------------------------------
+-------------------------------------------
 
 For the moment in this case only the `exact` evolution is implemented.
 

extras/matching/check-matching.py

@@ -13,7 +13,7 @@
 
 import eko
 from eko.interpolation import lambertgrid
-from ekomark.apply import apply_pdf
+from ekobox.apply import apply_pdf
 
 t = {
     "ID": 0,

pyproject.toml

@@ -21,8 +21,13 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Physics",
   "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
-repository = "https://github.com/N3PDF/eko"
-include = ["src/ekomark/benchmark/external/LHA.yaml", "doc/source/img/Logo.png"]
+repository = "https://github.com/NNPDF/eko"
+include = [
+  "doc/source/img/Logo.png",
+  "src/ekobox/genpdf/templatePDF.info",
+  "src/ekobox/genpdf/Toy.info",
+  "src/ekomark/benchmark/external/LHA.yaml",
+]
 packages = [
   { include = "eko", from = "src" },
   { include = "ekomark", from = "src" },
@@ -82,7 +87,7 @@ devtools = "^0.10.0"
 [tool.poetry.extras]
 docs = ["sphinx", "sphinx-rtd-theme", "sphinxcontrib-bibtex", "nbsphinx"]
 mark = ["banana-hep", "sqlalchemy", "pandas", "matplotlib"]
-box = ["banana-hep", "sqlalchemy", "pandas", "matplotlib", "rich"]
+box = ["rich"]
 
 [tool.poetry-dynamic-versioning]
 enable = true

src/ekobox/__init__.py

@@ -1,4 +1,3 @@
 """EKO user interface package."""
-from ekomark import apply
 
-from . import cards, evol_pdf, info_file
+from . import apply, cards, evol_pdf, info_file

src/ekobox/evol_pdf.py

@@ -6,9 +6,8 @@
 import eko
 from eko import basis_rotation as br
 from eko.io import EKO
-from ekomark import apply
 
-from . import genpdf, info_file
+from . import apply, genpdf, info_file
 
 DEFAULT_NAME = "eko.tar"
 

src/ekobox/genpdf/__init__.py

@@ -5,7 +5,6 @@
 import shutil
 
 import numpy as np
-from banana import toy
 
 from eko import basis_rotation as br
 
@@ -55,6 +54,9 @@ def take_data(parent_pdf_set=None, members=False, xgrid=None, Q2grid=None):
         }
     if isinstance(parent_pdf_set, str):
         if parent_pdf_set in ["toy_pol", "toy"]:
+            # delay import to ease nnpdf integration
+            from banana import toy  # pylint: disable=import-outside-toplevel
+
             info = copy.deepcopy(load.Toy_info)
             if "pol" in parent_pdf_set:
                 toylh = toy.mkPDF("ToyLH_polarized", 0)

src/ekomark/benchmark/runner.py

@@ -14,8 +14,9 @@
 from eko import EKO
 from eko import basis_rotation as br
 from eko.io import manipulate
+from ekobox import apply
 
-from .. import apply, pdfname
+from .. import pdfname
 from ..data import db, operators
 
 
@@ -104,7 +105,6 @@ def run_me(self, theory, ocard, _pdf):
                 print(f"Using cached eko data: {os.path.relpath(path,os.getcwd())}")
 
             if self.plot_operator:
-
                 from ekomark.plots import (  # pylint:disable=import-error,import-outside-toplevel
                     save_operators_to_pdf,
                 )
@@ -245,15 +245,13 @@ def log(self, theory, _, pdf, me, ext):
                 qed=qed,
             )
         for q2 in q2s:
-
             log_tab = dfdict.DFdict()
             ref_pdfs = ext["values"][q2]
             res = pdf_grid[q2]
             my_pdfs = res["pdfs"]
             my_pdf_errs = res["errors"]
 
             for key in my_pdfs:
-
                 if key in self.skip_pdfs(theory):
                     continue
 

tests/ekomark/test_apply.py → tests/ekobox/test_apply.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from ekomark import apply
+from ekobox import apply
 from tests.conftest import EKOFactory