From 22e755150d6c85b672fa8c6b6d9df15bce689325 Mon Sep 17 00:00:00 2001 From: Zahari Kassabov Date: Fri, 11 Nov 2022 15:44:06 +0000 Subject: [PATCH 1/6] Build for Python 3.10 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e12b15d9d2..7292709161 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.8, 3.9] + python-version: ["3.9", "3.10"] include: - os: ubuntu-latest CONDA_OS: linux-64 From bfe229fa179a5efeb17139c49d59c6423bfc8842 Mon Sep 17 00:00:00 2001 From: Zahari Kassabov Date: Mon, 21 Nov 2022 17:11:24 +0000 Subject: [PATCH 2/6] Test --- conda-recipe/conda_build_config.yaml | 2 +- conda-recipe/meta.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index 327e710892..71cab38400 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.19 + - 1.22 pin_run_as_build: lhapdf: x.x.x diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index adc3c6328e..b14303e740 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -50,7 +50,6 @@ requirements: - recommonmark - sphinx_rtd_theme >0.5 - sphinxcontrib-bibtex - - docutils =0.16 # This dependency is not explicity needed but https://github.com/NNPDF/nnpdf/issues/1220 - curio >=1.0 - pineappl >=0.5.2 From c0856152b623ee78aeeedf46f191d16d3fe0b22c Mon Sep 17 00:00:00 2001 From: Zahari Kassabov Date: Wed, 23 Nov 2022 13:20:48 +0000 Subject: [PATCH 3/6] Don't cancel associated jobs This makes it hard to debug os-specific problems. Description at https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7292709161..e890084de0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,6 +18,7 @@ jobs: CONDA_OS: linux-64 - os: macos-latest CONDA_OS: osx-64 + fail-fast: false runs-on: ${{ matrix.os }} env: NETRC_FILE: ${{ secrets.NETRC_FILE }} From b3b764a87bbba9e6a457637bdc2ae372115e59f8 Mon Sep 17 00:00:00 2001 From: Zahari Kassabov Date: Wed, 8 Feb 2023 16:47:31 +0000 Subject: [PATCH 4/6] Run CI From 150f3ec936365fc060119df74d9d34e65a5f6bc2 Mon Sep 17 00:00:00 2001 From: "Juan M. Cruz-Martinez" Date: Tue, 14 Feb 2023 10:21:14 +0100 Subject: [PATCH 5/6] try the fitbot with 3.10 --- .github/workflows/fitbot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fitbot.yml b/.github/workflows/fitbot.yml index 17f8162877..e859b520be 100644 --- a/.github/workflows/fitbot.yml +++ b/.github/workflows/fitbot.yml @@ -11,7 +11,7 @@ env: N3FIT_MAXNREP: 20 # total number of replicas to fit POSTFIT_NREP: 16 # requested replicas for postfit REFERENCE_SET: NNBOT-90875c07e-2022-11-30 # reference set for vp - CONDA_PY: 39 + CONDA_PY: 310 jobs: build: @@ -20,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.9] + python-version: ["3.10"] runs-on: ${{ matrix.os }} env: NETRC_FILE: ${{ secrets.NETRC_FILE }} From 28fd39b24fc850d6f2884ecadd7b5de9d34dbb78 Mon Sep 17 00:00:00 2001 From: "Juan M. Cruz-Martinez" Date: Wed, 8 Feb 2023 16:51:08 +0100 Subject: [PATCH 6/6] Update developing.yml --- n3fit/runcards/examples/developing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/n3fit/runcards/examples/developing.yml b/n3fit/runcards/examples/developing.yml index 57c10236bc..2db98eacd5 100644 --- a/n3fit/runcards/examples/developing.yml +++ b/n3fit/runcards/examples/developing.yml @@ -92,6 +92,7 @@ parameters: # This defines the parameter dictionary that is passed to the Model fitting: fitbasis: EVOL # EVOL (7), EVOLQED (8), etc. + savepseudodata: False basis: - {fl: sng, trainable: false, smallx: [1.093, 1.121], largex: [1.486, 3.287]} - {fl: g, trainable: false, smallx: [0.8329, 1.071], largex: [3.084, 6.767]}