From 92650621b7a02c9f221f295fdbccbefbf3dd9c6f Mon Sep 17 00:00:00 2001 From: Vyacheslav Smirnov Date: Wed, 20 Jan 2021 13:34:12 +0300 Subject: [PATCH 1/2] Update wheels build + Update linux build tag for wheels --- conda-recipe/bld.bat | 8 ++++++++ conda-recipe/build.sh | 18 +++++++++++++++++- conda-recipe/meta.yaml | 21 +-------------------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 1709a670a..fdd3a9cd4 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -2,3 +2,11 @@ echo on "%PYTHON%" setup.py build install --single-version-externally-managed --record=record.txt if errorlevel 1 exit 1 + +rem Build wheel package +if NOT "%WHEELS_OUTPUT_FOLDER%"=="" ( + %PYTHON% setup.py bdist_wheel + if errorlevel 1 exit 1 + copy dist\sdc*.whl %WHEELS_OUTPUT_FOLDER% + if errorlevel 1 exit 1 +) diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 36247441a..d38205712 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -1,4 +1,20 @@ set -ex -MACOSX_DEPLOYMENT_TARGET=10.9 \ +if [ `uname` == Darwin ]; then + WHEELS_BUILD_ARGS="" + export MACOSX_DEPLOYMENT_TARGET=10.9 +else + if [ "$CONDA_PY" == "36" ]; then + WHEELS_BUILD_ARGS="-p manylinux1_x86_64" + else + WHEELS_BUILD_ARGS="-p manylinux2014_x86_64" + fi +fi + $PYTHON setup.py build install --single-version-externally-managed --record=record.txt + +# Build wheel package +if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then + $PYTHON setup.py bdist_wheel ${WHEELS_BUILD_ARGS} + cp dist/sdc*.whl ${WHEELS_OUTPUT_FOLDER} +fi diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 11369b6ba..69f8b2737 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -13,13 +13,12 @@ build: number: {{ GIT_DESCRIBE_NUMBER|int }} script_env: - SDC_CONFIG_PIPELINE_SDC + - WHEELS_OUTPUT_FOLDER requirements: build: - {{ compiler('c') }} # [not osx] - {{ compiler('cxx') }} # [not osx] - - wheel - - python host: - python @@ -44,24 +43,6 @@ test: imports: - sdc -outputs: - - type: conda - name: sdc - - type: wheel - name: sdc - requirements: - build: - - {{ compiler('c') }} # [not osx] - - {{ compiler('cxx') }} # [not osx] - - python - - wheel - - setuptools - - numba {{ NUMBA_VERSION }} - - numpy - - pandas {{ PANDAS_VERSION }} - - pyarrow {{ PYARROW_VERSION }} - - tbb-devel - about: home: https://github.com/IntelPython/sdc license: BSD-2-Clause From be90a9786320fc9b50cd4462ca2e13d9baf97765 Mon Sep 17 00:00:00 2001 From: Vyacheslav Smirnov Date: Wed, 3 Feb 2021 21:41:42 +0300 Subject: [PATCH 2/2] Put numba back to build deps --- conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 69f8b2737..ed1084d14 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -19,6 +19,7 @@ requirements: build: - {{ compiler('c') }} # [not osx] - {{ compiler('cxx') }} # [not osx] + - numba {{ NUMBA_VERSION }} host: - python