diff --git a/.ciscripts/build-deploy-linux.sh b/.ciscripts/build-deploy-linux.sh index 758c45e2cb..4e642cd1e1 100755 --- a/.ciscripts/build-deploy-linux.sh +++ b/.ciscripts/build-deploy-linux.sh @@ -13,7 +13,7 @@ echo "$NETRC_FILE" | base64 --decode > ~/.netrc conda info -a #Build package -CONDA_PY=$CONDA_PY conda build -q conda-recipe +CONDA_PY=$CONDA_PY conda build conda-recipe if [ $? != 0 ]; then echo failed to build exit 1 diff --git a/.ciscripts/build-deploy-osx.sh b/.ciscripts/build-deploy-osx.sh index 9738d2f81c..9d0deaaf86 100755 --- a/.ciscripts/build-deploy-osx.sh +++ b/.ciscripts/build-deploy-osx.sh @@ -8,7 +8,7 @@ echo "$NETRC_FILE" | base64 --decode > ~/.netrc # print out basic conda info conda info -a -conda build -q conda-recipe +conda build conda-recipe if [ $? != 0 ]; then echo failed to build exit 1 diff --git a/.travis.yml b/.travis.yml index cf29ea4bdf..ff15066474 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,15 +16,14 @@ env: global: - CONDAPATH="/Users/travis/miniconda3" - OUTPUT_ARCH=osx-64 - - OUTPUT_CHANNEL=conda-private + - OUTPUT_CHANNEL=private - UPLOAD_NON_MASTER="false" - CONDA_BUILD_SYSROOT="${CONDAPATH}/MacOSX10.9.sdk" - # pin conda build on OSX because of issue with channel name - # https://github.com/NNPDF/nnpdf/issues/915 - - CONDA_BUILD_VERSION=3.18.11 + - CONDA_BUILD_VERSION=3 matrix: - CONDA_PY=37 + - CONDA_PY=38 before_install: # Remove homebrew. @@ -96,8 +95,8 @@ install: tar xfz MacOSX10.9.sdk.tar.xz -C "${CONDAPATH}"; source /Users/travis/miniconda3/bin/activate root; conda config --append channels conda-forge; - conda config --add channels https://packages.nnpdf.science/conda; - conda config --add channels https://packages.nnpdf.science/conda-private; + conda config --add channels https://packages.nnpdf.science/public; + conda config --add channels https://packages.nnpdf.science/private; conda config --set show_channel_urls true; conda install --yes conda-build=$CONDA_BUILD_VERSION; fi diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index 6ffbd14e0e..d67268d9a7 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.14 + - 1.19 pin_run_as_build: lhapdf: x.x.x diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 12216f96d2..1790431bed 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -9,11 +9,11 @@ requirements: build: - {{ compiler("cxx") }} - {{ compiler("c") }} - - swig ==3.0.10 + - swig - cmake - pkg-config host: - - lhapdf # with python3.6 wrapper + - lhapdf # with python wrapper - sqlite - gsl # Gsl doesn't link openblas on old debian 7 - libarchive @@ -36,13 +36,13 @@ requirements: - apfel - pkg-config - python # requirements for validphys - - reportengine >=0.28 # see https://github.com/NNPDF/reportengine + - reportengine >=0.28.60 # see https://github.com/NNPDF/reportengine - matplotlib >=3.3.0 - - blessings + - blessings >=1.7 - scipy >=0.19.1 - - pandas =1.0 + - pandas - requests - - prompt_toolkit =2 + - prompt_toolkit - sphinx # documentation - recommonmark - sphinx_rtd_theme diff --git a/docker/dockerfile b/docker/dockerfile index edd12acce0..50ea57c0d8 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -1,4 +1,4 @@ -FROM centos:6 +FROM centos:7 MAINTAINER Zahari Kassabov @@ -33,7 +33,7 @@ RUN wget "$CONDA_URL" && \ ENV PATH /root/miniconda3/bin:$PATH RUN conda config --append channels conda-forge && \ - conda config --prepend channels https://packages.nnpdf.science/conda/ && \ + conda config --prepend channels https://packages.nnpdf.science/public/ && \ conda config --set show_channel_urls true && \ conda install conda-build --yes