diff --git a/README.rst b/README.rst index a5f18b8a9..fc4e8abef 100644 --- a/README.rst +++ b/README.rst @@ -34,13 +34,13 @@ Distribution includes Intel® SDC for Python 3.6 and Python 3.7 for Windows and Intel® SDC conda package can be installed using the steps below:: - > conda create -n sdc-env python=<3.7 or 3.6> pyarrow=0.17.0 pandas=1.2.0 -c anaconda -c conda-forge + > conda create -n sdc-env python=<3.7 or 3.6> pyarrow=2.0.0 pandas=1.2.0 -c anaconda -c conda-forge > conda activate sdc-env > conda install sdc -c intel/label/beta -c intel -c defaults -c conda-forge --override-channels Intel® SDC wheel package can be installed using the steps below:: - > conda create -n sdc-env python=<3.7 or 3.6> pip pyarrow=0.17.0 pandas=1.2.0 -c anaconda -c conda-forge + > conda create -n sdc-env python=<3.7 or 3.6> pip pyarrow=2.0.0 pandas=1.2.0 -c anaconda -c conda-forge > conda activate sdc-env > pip install --index-url https://pypi.anaconda.org/intel/label/beta/simple --extra-index-url https://pypi.anaconda.org/intel/simple --extra-index-url https://pypi.org/simple sdc @@ -82,7 +82,7 @@ Building on Linux with setuptools export PYVER=<3.6 or 3.7> export NUMPYVER=<1.16 or 1.17> - conda create -n sdc-env -q -y -c intel/label/beta -c defaults -c intel -c conda-forge python=$PYVER numpy=$NUMPYVER tbb-devel tbb4py numba=0.52 pandas=1.2.0 pyarrow=0.17.0 gcc_linux-64 gxx_linux-64 + conda create -n sdc-env -q -y -c intel/label/beta -c defaults -c intel -c conda-forge python=$PYVER numpy=$NUMPYVER tbb-devel tbb4py numba=0.52 pandas=1.2.0 pyarrow=2.0.0 gcc_linux-64 gxx_linux-64 source activate sdc-env git clone https://github.com/IntelPython/sdc.git cd sdc @@ -120,7 +120,7 @@ Building on Windows with setuptools set PYVER=<3.6 or 3.7> set NUMPYVER=<1.16 or 1.17> - conda create -n sdc-env -c intel/label/beta -c defaults -c intel -c conda-forge python=%PYVER% numpy=%NUMPYVER% tbb-devel tbb4py numba=0.52 pandas=1.2.0 pyarrow=0.17.0 + conda create -n sdc-env -c intel/label/beta -c defaults -c intel -c conda-forge python=%PYVER% numpy=%NUMPYVER% tbb-devel tbb4py numba=0.52 pandas=1.2.0 pyarrow=2.0.0 conda activate sdc-env set INCLUDE=%INCLUDE%;%CONDA_PREFIX%\Library\include set LIB=%LIB%;%CONDA_PREFIX%\Library\lib 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 de5818a38..17189b818 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ {% set NUMBA_VERSION = "==0.52.0" %} {% set PANDAS_VERSION = "==1.2.0" %} -{% set PYARROW_VERSION = "==0.17.0" %} +{% set PYARROW_VERSION = "==2.0.0" %} package: name: sdc @@ -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 - numba {{ NUMBA_VERSION }} host: @@ -45,24 +44,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 diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst index b0fcc0182..2156c2214 100644 --- a/docs/source/getting_started.rst +++ b/docs/source/getting_started.rst @@ -41,14 +41,14 @@ Distribution includes Intel SDC for Python 3.6 and 3.7 for Windows and Linux pla Intel SDC conda package can be installed using the steps below: :: - > conda create -n sdc_env python=<3.7 or 3.6> pyarrow=0.17.0 pandas=1.2.0 -c anaconda -c conda-forge + > conda create -n sdc_env python=<3.7 or 3.6> pyarrow=2.0.0 pandas=1.2.0 -c anaconda -c conda-forge > conda activate sdc_env > conda install sdc -c intel/label/beta -c intel -c defaults -c conda-forge --override-channels Intel SDC wheel package can be installed using the steps below: :: - > conda create -n sdc_env python=<3.7 or 3.6> pip pyarrow=0.17.0 pandas=1.2.0 -c anaconda -c conda-forge + > conda create -n sdc_env python=<3.7 or 3.6> pip pyarrow=2.0.0 pandas=1.2.0 -c anaconda -c conda-forge > conda activate sdc_env > pip install --index-url https://pypi.anaconda.org/intel/label/beta/simple --extra-index-url https://pypi.anaconda.org/intel/simple --extra-index-url https://pypi.org/simple sdc diff --git a/requirements.txt b/requirements.txt index f3016c49e..4e7e3940c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy>=1.16 pandas==1.2.0 -pyarrow==0.17.0 +pyarrow==2.0.0 numba==0.52.0 tbb tbb-devel diff --git a/setup.py b/setup.py index 903725410..7a3b60388 100644 --- a/setup.py +++ b/setup.py @@ -376,7 +376,7 @@ def run(self): install_requires=[ 'numpy>=1.16', 'pandas>=1.2.0', - 'pyarrow==0.17.0', + 'pyarrow==2.0.0', 'numba>=0.52.0,<0.53', 'tbb' ],