Skip to content

Commit 2ebd525

Browse files
authored
Merge branch 'master' into dask-interface
2 parents 647d164 + 3f604fd commit 2ebd525

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

.github/workflows/build-with-clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
architecture: x64
5151

5252
- name: Checkout repo
53-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
53+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5454
with:
5555
fetch-depth: 0
5656

.github/workflows/build_pip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
sudo apt-get install jq
3333
34-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535
with:
3636
fetch-depth: 0
3737

.github/workflows/conda-package-cf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
access_token: ${{ github.token }}
3939

40-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
40+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4141
with:
4242
fetch-depth: 0
4343

@@ -174,7 +174,7 @@ jobs:
174174
with:
175175
access_token: ${{ github.token }}
176176

177-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
177+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
178178
with:
179179
fetch-depth: 0
180180

.github/workflows/conda-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
access_token: ${{ github.token }}
2929

30-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3131
with:
3232
fetch-depth: 0
3333

@@ -168,7 +168,7 @@ jobs:
168168
with:
169169
access_token: ${{ github.token }}
170170

171-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
171+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
172172
with:
173173
fetch-depth: 0
174174

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3838
with:
3939
persist-credentials: false
4040

@@ -69,6 +69,6 @@ jobs:
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
72+
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
7373
with:
7474
sarif_file: results.sarif

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
timeout-minutes: 30
1414
steps:
1515
- name: Checkout repo
16-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717

1818
- name: Set up python
1919
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0

conda-recipe/meta.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
{% set version = "2.1.0dev0" %}
2-
{% set buildnumber = 0 %}
3-
41
package:
52
name: mkl_fft
6-
version: {{ version }}
3+
version: {{ GIT_DESCRIBE_TAG }}
74

85
source:
96
path: ../
107

118
build:
12-
number: {{ buildnumber }}
9+
number: {{ GIT_DESCRIBE_NUMBER }}
1310
script_env:
1411
- WHEELS_OUTPUT_FOLDER
1512
ignore_run_exports:
@@ -50,4 +47,13 @@ about:
5047
home: http://github.com/IntelPython/mkl_fft
5148
license: BSD-3-Clause
5249
license_file: LICENSE.txt
53-
summary: NumPy-based implementation of Fast Fourier Transform using Intel® oneAPI Math Kernel Library (OneMKL)
50+
summary: NumPy-based implementation of Fast Fourier Transform using Intel® oneAPI Math Kernel Library (oneMKL)
51+
description: |
52+
<strong>LEGAL NOTICE: Use of this software package is subject to the
53+
software license agreement (as set forth above, in the license section of
54+
the installed Conda package and/or the README file) and all notices,
55+
disclaimers or license terms for third party or open source software
56+
included in or with the software.</strong>
57+
<br/><br/>
58+
EULA: <a href="https://opensource.org/licenses/BSD-3-Clause" target="_blank">BSD-3-Clause</a>
59+
<br/><br/>

0 commit comments

Comments
 (0)