Skip to content

Commit

Permalink
enable python 3.12 in conda
Browse files Browse the repository at this point in the history
  • Loading branch information
scarlehoff authored Mar 8, 2024
1 parent 2ec03d5 commit 4961a0d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fitbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
POSTFIT_NREP: 16 # requested replicas for postfit
REFERENCE_SET: NNBOT-c07b1a1ce-2024-03-05 # reference set for exact results
STABLE_REFERENCE_SET: NNBOT-c0f99b7b3-2024-02-28 # reference set for last tag
CONDA_PY: 310
CONDA_PY: 312
PYTHONHASHSEED: "0"

jobs:
Expand All @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.10"]
python-version: ["3.12"]
runs-on: ${{ matrix.os }}
env:
NETRC_FILE: ${{ secrets.NETRC_FILE }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ["3.9", "3.11"] # only test for the outer values for the range we support to prevent the cluster from refusing connections due to too many requests
python-version: ["3.9", "3.12"] # only test for the outer values for the range we support to prevent the cluster from refusing connections due to too many requests
fail-fast: false
runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
conda install boa conda-build==3.28 --yes
conda build -q conda-recipe
- name: Upload noarch conda package to NNPDF server
if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')}} && startsWith(matrix.os, 'ubuntu') && matrix.python-version == '3.11'
if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')}} && startsWith(matrix.os, 'ubuntu') && matrix.python-version == '3.9'
shell: bash -l {0}
run: |
KEY=$( mktemp )
Expand All @@ -61,7 +61,7 @@ jobs:
$CONDA_PREFIX/conda-bld/noarch/*.tar.bz2 \
[email protected]:~/packages/conda/noarch
- name: Build and upload sphinx documentation to NNPDF server
if: startsWith(matrix.os, 'ubuntu') && github.ref == 'refs/heads/master' && matrix.python-version == '3.11'
if: startsWith(matrix.os, 'ubuntu') && github.ref == 'refs/heads/master' && matrix.python-version == '3.9'
shell: bash -l {0}
run: |
KEY=$( mktemp )
Expand Down
11 changes: 5 additions & 6 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ build:

requirements:
host:
- python >=3.9,<3.12
- python >=3.9,<3.13
- poetry-core >=1.0.0
- poetry-dynamic-versioning >=1.2.0
- pip
run:
- python >=3.9,<3.12
- python >=3.9,<3.13
- tensorflow >=2.10
- psutil # to ensure n3fit affinity is with the right processors
- blas==1.0 *mkl* # [osx] # Host's blas is mkl, force also runtime blas to be
Expand All @@ -33,17 +33,16 @@ requirements:
- sqlite
- numpy
- pkg-config
- reportengine ==0.30.28 # see https://github.com/NNPDF/reportengine
- curio >=1.0 # reportengine uses it but it's not in its dependencies
- reportengine
- matplotlib >=3.3.0,<3.8 # see https://github.com/NNPDF/nnpdf/pull/1809
- blessings >=1.7
- scipy >=0.19.1
- pandas
- requests
- prompt_toolkit
- validobj
- pineappl >=0.6.2
- eko >=0.14.1
- pineappl >=0.7.3
- eko >=0.14.2
- fiatlux
- frozendict # needed for caching of data loading
- sphinx >=5.0.2,<6 # documentation. Needs pinning temporarily due to markdown
Expand Down

0 comments on commit 4961a0d

Please sign in to comment.