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

Migrating numba from 0.54.0 to 0.54.1 #987

Merged
merged 2 commits into from
Oct 30, 2021
Merged

Migrating numba from 0.54.0 to 0.54.1 #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ccfd22
Migrating numba from 0.54.0 to 0.54.1
kozlov-alexey Oct 28, 2021
fdc83b3
Moving to new azure image for Linux and excluding skipped tests
kozlov-alexey Oct 29, 2021
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
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions sdc/_str_ext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include <vector>
#include <cmath>
#include <algorithm>
#include <stdexcept>
#include <limits>

#include "_str_decode.cpp"

Expand Down
6 changes: 3 additions & 3 deletions sdc/tests/test_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down