Merge branch 'main' into docs/release-0.20

IntelPython · Jun 17, 2023 · f8c362a · f8c362a
2 parents 928dc53 + 65576fa
commit f8c362a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/actions/setup-numba-dpex/action.yml b/.github/actions/setup-numba-dpex/action.yml
@@ -16,6 +16,10 @@ runs:
       run: conda env update -n base -f ${{ inputs.environment }} --prune
       shell: bash
 
+    - name: Test conda environment
+      run: conda list
+      shell: bash
+
     - name: Build numba-dpex
       run: |
         export PATH=$CONDA/bin-llvm:$PATH

diff --git a/environment/docs.yml b/environment/docs.yml
@@ -1,18 +1,17 @@
-name: dev
+name: dpex-docs-dev
 channels:
-  - defaults
   - dppy/label/dev
   - numba
   - intel
-  - numba/label/dev
+  - conda-forge
   - nodefaults
 dependencies:
-  - python=3.9
+  - python=3.10
   - gxx_linux-64
   - dpcpp_linux-64
   - numba 0.57*
   - dpctl 0.14*
-  - dpnp >=0.10.2
+  - dpnp >=0.12*
   - spirv-tools
   - dpcpp-llvm-spirv
   - packaging
@@ -23,8 +22,6 @@ dependencies:
     - pre-commit
     - flake8
     - black==20.8b1
-    - pytest-cov
-    - pytest-xdist
     - pexpect
     - sphinx
     - autodoc
@@ -34,6 +31,3 @@ dependencies:
     - sphinxcontrib-googleanalytics
     - sphinxcontrib.programoutput
     - pydata-sphinx-theme
-variables:
-  CHANNELS: -c defaults -c numba -c intel -c numba/label/dev -c dppy/label/dev --override-channels
-  CHANNELS_DEV: -c dppy/label/dev -c defaults -c numba -c intel -c numba/label/dev --override-channels