Merge branch 'main' into add-ilp64

Author: vtavana

.github/workflows/conda-package.yml

@@ -52,7 +52,7 @@ jobs:
 
       - name: Build conda package
         run: |
-          CHANNELS="-c conda-forge -c https://software.repos.intel.com/python/conda --override-channels"
+          CHANNELS="-c https://software.repos.intel.com/python/conda -c conda-forge --override-channels"
           VERSIONS="--python ${{ matrix.python }}"
           TEST="--no-test"
           echo "CONDA_BLD=${CONDA}/conda-bld/linux-64" >> $GITHUB_ENV
@@ -80,7 +80,7 @@ jobs:
         runner: [ubuntu-latest]
     continue-on-error: ${{ matrix.experimental }}
     env:
-      CHANNELS: -c conda-forge -c https://software.repos.intel.com/python/conda --override-channels
+      CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels
 
     steps:
       - name: Download artifact
@@ -193,7 +193,7 @@ jobs:
       - name: Build conda package
         run: |
           conda activate
-          conda build --no-test --python ${{ matrix.python }} -c conda-forge -c https://software.repos.intel.com/python/conda --override-channels conda-recipe
+          conda build --no-test --python ${{ matrix.python }} -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels conda-recipe
 
       - name: Upload artifact
         uses: actions/[email protected]
@@ -215,7 +215,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     env:
       workdir: '${{ github.workspace }}'
-      CHANNELS: -c conda-forge -c https://software.repos.intel.com/python/conda --override-channels
+      CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels
 
     steps:
       - name: Download artifact

mkl_umath/tests/test_basic.py

@@ -44,7 +44,7 @@ def get_args(args_str):
         elif s == 'i':
             args.append(np.int_(np.random.randint(low=1, high=10)))
         elif s == 'l':
-            args.append(np.int64(np.random.randint(low=1, high=10)))
+            args.append(np.dtype('long').type(np.random.randint(low=1, high=10)))
         elif s == 'q':
             args.append(np.int64(np.random.randint(low=1, high=10)))
         else: