From 6066cfe06548968bc8718779b80a414b798b7b49 Mon Sep 17 00:00:00 2001 From: Zahari Date: Fri, 8 Jan 2021 16:20:07 +0000 Subject: [PATCH 1/9] Build for Python 3.8 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cf29ea4bdf..b7aaae329e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ env: matrix: - CONDA_PY=37 + - CONDA_PY=38 before_install: # Remove homebrew. From 790d937768b9718f995830aafc60c763878abf37 Mon Sep 17 00:00:00 2001 From: Zahari Date: Sun, 10 Jan 2021 22:18:09 +0000 Subject: [PATCH 2/9] Update docker image Use a more recent version of centos and the packages that don't crash. --- docker/dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 1aa9d4b7969234bc9af55a6a00fdbafa50edb259 Mon Sep 17 00:00:00 2001 From: Zahari Date: Sun, 10 Jan 2021 22:20:20 +0000 Subject: [PATCH 3/9] Don't be silent --- .ciscripts/build-deploy-linux.sh | 2 +- .ciscripts/build-deploy-osx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From e1ecc033c31b335aaf7599cf2adf965fcd6c0389 Mon Sep 17 00:00:00 2001 From: Zahari Date: Mon, 11 Jan 2021 22:00:09 +0000 Subject: [PATCH 4/9] Use new conda build version --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b7aaae329e..24b76de6b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,7 @@ env: - OUTPUT_CHANNEL=conda-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 From 239538326ea22f61a8d04dbaeeb09702e59d2065 Mon Sep 17 00:00:00 2001 From: Zahari Date: Mon, 11 Jan 2021 22:04:49 +0000 Subject: [PATCH 5/9] Use new channels --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24b76de6b1..ff15066474 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ 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" - CONDA_BUILD_VERSION=3 @@ -95,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 From 2b36c1e6bb08dd54a49a161fb0887ecf662640d1 Mon Sep 17 00:00:00 2001 From: Zahari Date: Mon, 11 Jan 2021 23:04:06 +0000 Subject: [PATCH 6/9] Try to update numpy --- conda-recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0d5bda18f2e57c369d044098c27764635c8e0820 Mon Sep 17 00:00:00 2001 From: Zahari Date: Tue, 12 Jan 2021 11:23:49 +0000 Subject: [PATCH 7/9] Update comment --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 12216f96d2..974774704e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -13,7 +13,7 @@ requirements: - 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 From 69593469732730fc58613f64b59891b21d9daf62 Mon Sep 17 00:00:00 2001 From: Zahari Date: Tue, 12 Jan 2021 11:25:39 +0000 Subject: [PATCH 8/9] Try to force sane dependencies --- conda-recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 974774704e..278b9b8125 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -36,11 +36,11 @@ 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 - sphinx # documentation From e579b4a0452522a2283d174132999b9a54a42f84 Mon Sep 17 00:00:00 2001 From: Zahari Date: Tue, 12 Jan 2021 12:05:15 +0000 Subject: [PATCH 9/9] Remove contraints --- conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 278b9b8125..1790431bed 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -9,7 +9,7 @@ requirements: build: - {{ compiler("cxx") }} - {{ compiler("c") }} - - swig ==3.0.10 + - swig - cmake - pkg-config host: @@ -42,7 +42,7 @@ requirements: - scipy >=0.19.1 - pandas - requests - - prompt_toolkit =2 + - prompt_toolkit - sphinx # documentation - recommonmark - sphinx_rtd_theme