From 984a4a6a49191a5496805f696b1ad1431929ce84 Mon Sep 17 00:00:00 2001
From: Sergey Pokhodenko <sergey.pokhodenko@intel.com>
Date: Thu, 14 Oct 2021 17:12:27 +0300
Subject: [PATCH] Support Numba 0.55 (master branch) (#583)

* Allow use numba 0.55 in setup.py
* Add numba 0.55 in test matrix
* Update conda recipe
* Update README and docs
* Use numba 0.54 or 0.55 in docs
---
 .github/workflows/conda-package.yml  | 4 +++-
 README.md                            | 2 +-
 conda-recipe/meta.yaml               | 4 ++--
 docs/user_guides/getting_started.rst | 2 +-
 environment.yml                      | 2 +-
 setup.py                             | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index cb4f543671..c17dcc194b 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -119,12 +119,14 @@ jobs:
     strategy:
       matrix:
         python: [3.8, 3.9]
+        numba: [0.54, 0.55]
         integration_channels: [""]
         experimental: [true]  # packages are not available on -c intel yet
         artifact_name: [""]
         dependencies: [""]
         include:
           - python: "3.8"
+            numba: 0.54
             integration_channels: -c dppy/label/dev
             artifact_name: -c dppy_label_dev
             experimental: false  # current stable
@@ -171,7 +173,7 @@ jobs:
       - name: Install numba-dppy
         run: |
           CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
-          conda install $PACKAGE_NAME pytest python=${{ matrix.python }} ${{ matrix.dependencies }} $CHANNELS
+          conda install $PACKAGE_NAME pytest python=${{ matrix.python }} numba=${{ matrix.numba }} ${{ matrix.dependencies }} $CHANNELS
           # Test installed packages
           conda list
       - name: Run tests
diff --git a/README.md b/README.md
index 8e10e74cf3..dae0f5a770 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ https://intelpython.github.io/dpnp/
 
 ## Dependencies
 
-* numba 0.54.*
+* numba 0.54.* or 0.55.*
 * dpctl 0.10.*
 * dpnp 0.8.* (optional)
 * llvm-spirv 11.* (SPIRV generation from LLVM IR)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 28c87f1ff2..918f45c708 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -19,13 +19,13 @@ requirements:
         - python
         - setuptools
         - cython
-        - numba 0.54*
+        - numba 0.54*|0.55*
         - dpctl >=0.10*
         - dpnp >=0.8*  # [linux]
         - wheel
     run:
         - python
-        - numba 0.54*
+        - numba 0.54*|0.55*
         - dpctl >=0.10*
         - spirv-tools
         - llvm-spirv 11.*
diff --git a/docs/user_guides/getting_started.rst b/docs/user_guides/getting_started.rst
index e889611362..a4ba323a28 100644
--- a/docs/user_guides/getting_started.rst
+++ b/docs/user_guides/getting_started.rst
@@ -6,7 +6,7 @@ Installation
 
 Numba-dppy depends on following components:
 
-* numba 0.54.* (`Numba`_)
+* numba 0.54.* or 0.55.* (`Numba`_)
 * dpctl 0.9.* (`Intel Python dpctl`_)
 * dpnp >=0.6.* (optional, `Intel Python DPNP`_)
 * `llvm-spirv`_ (SPIRV generation from LLVM IR)
diff --git a/environment.yml b/environment.yml
index f294eb3164..b373b87ea1 100644
--- a/environment.yml
+++ b/environment.yml
@@ -11,7 +11,7 @@ dependencies:
   - gxx_linux-64
   - dpcpp_linux-64
   - cython
-  - numba 0.54*
+  - numba 0.55*
   - dpctl 0.10*
   - dpnp 0.8*
   - spirv-tools
diff --git a/setup.py b/setup.py
index bae9812986..20644158e0 100644
--- a/setup.py
+++ b/setup.py
@@ -135,7 +135,7 @@ def spirv_compile():
 packages = find_packages(include=["numba_dppy", "numba_dppy.*"])
 build_requires = ["cython"]
 install_requires = [
-    "numba >={},<{}".format("0.54.0", "0.55"),
+    "numba >={},<{}".format("0.54.0", "0.56"),
     "dpctl",
     "packaging",
 ]