Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ciscripts/build-deploy-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ciscripts/build-deploy-osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:6
FROM centos:7

MAINTAINER Zahari Kassabov

Expand Down Expand Up @@ -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

Expand Down