Skip to content

Commit 8007b87

Browse files
committed
Merge branch 'master' into bump-conda-build-version
2 parents de01c23 + 90d67f5 commit 8007b87

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/conda-package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
# Follow oneAPI installation instruction for conda, since intel channel is not longer available
1515
# CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
1616
CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
17-
CONDA_BUILD_VERSION: '24.9.1'
17+
CONDA_BUILD_VERSION: '24.9.0'
1818
CONDA_INDEX_VERSION: '0.5.0'
1919
RERUN_TESTS_ON_FAILURE: 'true'
2020
RUN_TESTS_MAX_ATTEMPTS: 2
@@ -241,7 +241,7 @@ jobs:
241241
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
242242
243243
- name: Install dpnp
244-
run: mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest numpy"<2.0a" python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
244+
run: mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
245245
env:
246246
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
247247
MAMBA_NO_LOW_SPEED_LIMIT: 1
@@ -387,7 +387,7 @@ jobs:
387387
- name: Install dpnp
388388
run: |
389389
@echo on
390-
mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest numpy"<2.0a" python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
390+
mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
391391
env:
392392
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
393393
MAMBA_NO_LOW_SPEED_LIMIT: 1

.github/workflows/generate_coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
if: env.INSTALL_ONE_API == 'yes'
8484
run: |
8585
mamba install cython llvm cmake">=3.21" scikit-build ninja pytest pytest-cov coverage[toml] \
86-
dpctl">=0.18.0dev0" numpy"<2.0a" ${{ env.NO_INTEL_CHANNELS }}
86+
dpctl">=0.18.0dev0" ${{ env.NO_INTEL_CHANNELS }}
8787
8888
- name: Install dpnp dependencies
8989
if: env.INSTALL_ONE_API != 'yes'

0 commit comments

Comments
 (0)