Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.

Commit 5341b55

Browse files
committed
Merge branch 'gold/2021' into sync/gold_2021_after_2021.3
2 parents 12403d0 + 86d9ea0 commit 5341b55

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Building on Linux with setuptools
8585

8686
export PYVER=<3.6 or 3.7>
8787
export NUMPYVER=<1.16 or 1.17>
88-
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
88+
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
8989
source activate sdc-env
9090
git clone https://github.com/IntelPython/sdc.git
9191
cd sdc
@@ -123,7 +123,7 @@ Building on Windows with setuptools
123123

124124
set PYVER=<3.6 or 3.7>
125125
set NUMPYVER=<1.16 or 1.17>
126-
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
126+
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
127127
conda activate sdc-env
128128
set INCLUDE=%INCLUDE%;%CONDA_PREFIX%\Library\include
129129
set LIB=%LIB%;%CONDA_PREFIX%\Library\lib

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131

3232
- template: buildscripts/azure/template-linux-macos.yml
3333
parameters:
34-
name: Ubuntu1604
35-
vmImage: ubuntu-16.04
34+
name: Ubuntu1804
35+
vmImage: ubuntu-18.04
3636
allowFailure: false
3737
matrix:
3838
py3.7_numpy1.17:

conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set NUMBA_VERSION = "==0.54.0" %}
1+
{% set NUMBA_VERSION = "==0.54.1" %}
22
{% set PANDAS_VERSION = "==1.2.0" %}
33
{% set PYARROW_VERSION = "==4.0.1" %}
44

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
numpy>=1.16
22
pandas==1.2.0
33
pyarrow==4.0.1
4-
numba==0.54.0
4+
numba==0.54.1
55
tbb
66
tbb-devel

sdc/_str_ext.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#include <vector>
3333
#include <cmath>
3434
#include <algorithm>
35+
#include <stdexcept>
36+
#include <limits>
3537

3638
#include "_str_decode.cpp"
3739

sdc/tests/test_io.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ def test_pyarrow(self):
250250
"csv_parallel1",
251251
"csv_str_parallel1",
252252
"csv_usecols1",
253-
"csv_cat1",
254-
"csv_cat2",
255-
"csv_single_dtype1",
253+
# "csv_cat1",
254+
# "csv_cat2",
255+
# "csv_single_dtype1",
256256
]
257257
for test in tests:
258258
with self.subTest(test=test):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ def run(self):
405405
'numpy>=1.16',
406406
'pandas==1.2.0',
407407
'pyarrow==4.0.1',
408-
'numba==0.54.0',
408+
'numba==0.54.1',
409409
'tbb'
410410
],
411411
cmdclass=sdc_build_commands,

0 commit comments

Comments
 (0)