From 3ccfd22d3affbbf9fad68fbd1532ecc883fd43b9 Mon Sep 17 00:00:00 2001 From: "Kozlov, Alexey" Date: Thu, 28 Oct 2021 19:28:59 +0300 Subject: [PATCH 1/2] Migrating numba from 0.54.0 to 0.54.1 --- README.rst | 4 ++-- conda-recipe/meta.yaml | 2 +- requirements.txt | 2 +- sdc/_str_ext.cpp | 2 ++ setup.py | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index b9c88eb76..ad38f87c2 100644 --- a/README.rst +++ b/README.rst @@ -85,7 +85,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.54.0 pandas=1.2.0 pyarrow=4.0.1 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.54.1 pandas=1.2.0 pyarrow=4.0.1 gcc_linux-64 gxx_linux-64 source activate sdc-env git clone https://github.com/IntelPython/sdc.git cd sdc @@ -123,7 +123,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.54.0 pandas=1.2.0 pyarrow=4.0.1 + 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.54.1 pandas=1.2.0 pyarrow=4.0.1 conda activate sdc-env set INCLUDE=%INCLUDE%;%CONDA_PREFIX%\Library\include set LIB=%LIB%;%CONDA_PREFIX%\Library\lib diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index e8841cc7c..25a783b62 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set NUMBA_VERSION = "==0.54.0" %} +{% set NUMBA_VERSION = "==0.54.1" %} {% set PANDAS_VERSION = "==1.2.0" %} {% set PYARROW_VERSION = "==4.0.1" %} diff --git a/requirements.txt b/requirements.txt index dd519fd03..b0d0cf72f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy>=1.16 pandas==1.2.0 pyarrow==4.0.1 -numba==0.54.0 +numba==0.54.1 tbb tbb-devel diff --git a/sdc/_str_ext.cpp b/sdc/_str_ext.cpp index b5e41ce17..f86beee1e 100644 --- a/sdc/_str_ext.cpp +++ b/sdc/_str_ext.cpp @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include "_str_decode.cpp" diff --git a/setup.py b/setup.py index 2267753f4..c717bf235 100644 --- a/setup.py +++ b/setup.py @@ -405,7 +405,7 @@ def run(self): 'numpy>=1.16', 'pandas==1.2.0', 'pyarrow==4.0.1', - 'numba==0.54.0', + 'numba==0.54.1', 'tbb' ], cmdclass=sdc_build_commands, From fdc83b36ca60ea72bfc4b15896c7aef783349970 Mon Sep 17 00:00:00 2001 From: "Kozlov, Alexey" Date: Fri, 29 Oct 2021 17:09:58 +0300 Subject: [PATCH 2/2] Moving to new azure image for Linux and excluding skipped tests --- azure-pipelines.yml | 4 ++-- sdc/tests/test_io.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a61d1ec94..06f8e43bd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,8 +31,8 @@ jobs: - template: buildscripts/azure/template-linux-macos.yml parameters: - name: Ubuntu1604 - vmImage: ubuntu-16.04 + name: Ubuntu1804 + vmImage: ubuntu-18.04 allowFailure: false matrix: py3.7_numpy1.17: diff --git a/sdc/tests/test_io.py b/sdc/tests/test_io.py index 55fead5ba..3acd89894 100644 --- a/sdc/tests/test_io.py +++ b/sdc/tests/test_io.py @@ -250,9 +250,9 @@ def test_pyarrow(self): "csv_parallel1", "csv_str_parallel1", "csv_usecols1", - "csv_cat1", - "csv_cat2", - "csv_single_dtype1", + # "csv_cat1", + # "csv_cat2", + # "csv_single_dtype1", ] for test in tests: with self.subTest(test=test):