From cb016e52de5f196f9a7129c555330a8220102d24 Mon Sep 17 00:00:00 2001 From: juacrumar Date: Mon, 11 Dec 2023 20:38:07 +0100 Subject: [PATCH 1/2] enable python 3.11 ; enable non-eigen tf above 3.11 and remove the pin in libarchive --- .github/workflows/tests.yml | 2 +- conda-recipe/conda_build_config.yaml | 2 +- conda-recipe/meta.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 15d8ebc133..636b514569 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: ["3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11"] include: - os: ubuntu-latest CONDA_OS: linux-64 diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index a15ac5fdef..a44b901cc3 100644 --- a/conda-recipe/conda_build_config.yaml +++ b/conda-recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ #For some reason the resolver decides to use an old version of numpy #without this numpy: - - 1.21 + - 1.24 pin_run_as_build: lhapdf: x.x.x diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 5aa5646be7..23b2098e1e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -18,13 +18,14 @@ requirements: - lhapdf # with python wrapper - sqlite - gsl # Gsl doesn't link openblas on old debian 7 - - libarchive ==3.4.2 # See https://github.com/NNPDF/nnpdf/pull/1130 + - libarchive - yaml-cpp >=0.6.3 - apfel >=3 # see https://github.com/scarrazza/apfel - python - numpy run: - - tensorflow >=2 *eigen* + - tensorflow >=2.10 + - tensorflow >=2.10 *eigen* # [py < 311] - psutil # to ensure n3fit affinity is with the right processors - hyperopt - seaborn @@ -52,7 +53,6 @@ requirements: - curio >=1.0 - pineappl >=0.6.2 - eko >=0.14.0 - - banana-hep >=0.6.8 - fiatlux test: From 3b00f2d2af54874998eda4f2a2aff1e9f1843749 Mon Sep 17 00:00:00 2001 From: "Juan M. Cruz-Martinez" Date: Tue, 12 Dec 2023 10:12:53 +0100 Subject: [PATCH 2/2] Update fitbot.yml just before tag --- .github/workflows/fitbot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fitbot.yml b/.github/workflows/fitbot.yml index ca557b55c1..a238776f9c 100644 --- a/.github/workflows/fitbot.yml +++ b/.github/workflows/fitbot.yml @@ -10,7 +10,7 @@ on: env: N3FIT_MAXNREP: 20 # total number of replicas to fit POSTFIT_NREP: 16 # requested replicas for postfit - REFERENCE_SET: NNBOT-092dc91e5-2023-12-06 # reference set for vp + REFERENCE_SET: NNBOT-a5240b65e-2023-12-12 # reference set for vp CONDA_PY: 310 jobs: