Skip to content

Commit 7e8b894

Browse files
authored
Merge branch 'master' into fix-meshgrid-return-type
2 parents c3be978 + cea897e commit 7e8b894

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/conda-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ jobs:
9191
- name: Build conda package
9292
id: build_conda_pkg
9393
continue-on-error: true
94-
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
94+
run: conda-build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
9595
env:
9696
MAX_BUILD_CMPL_MKL_VERSION: '2026.0a0'
9797

9898
- name: ReBuild conda package
9999
if: steps.build_conda_pkg.outcome == 'failure'
100-
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
100+
run: conda-build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe
101101
env:
102102
MAX_BUILD_CMPL_MKL_VERSION: '2026.0a0'
103103

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717

1818
### Fixed
1919

20+
* Fixed `conda build` command syntax in GitHub workflows and documentation to use `conda-build` [#2888](https://github.com/IntelPython/dpnp/pull/2888)
21+
2022
### Security
2123

2224

doc/quick_start_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ And to build dpnp package from the sources:
7474

7575
.. code-block:: bash
7676
77-
conda build conda-recipe -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels
77+
conda-build conda-recipe -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels
7878
7979
Finally, to install the result package:
8080

0 commit comments

Comments
 (0)