Skip to content

Commit 7bb1dcb

Browse files
authored
Merge branch 'main' into clean-up
2 parents 379f6c7 + 96d52bb commit 7bb1dcb

File tree

9 files changed

+39
-27
lines changed

9 files changed

+39
-27
lines changed

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

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

1414
strategy:
1515
matrix:
16-
python: ["3.9", "3.10", "3.11", "3.12"]
16+
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1717
numpy_version: ["numpy'<2'", "numpy'>=2'"]
1818

1919
env:
@@ -50,7 +50,7 @@ jobs:
5050
architecture: x64
5151

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

.github/workflows/build_pip.yaml

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

1818
strategy:
1919
matrix:
20-
python: ['3.9', '3.10', '3.11', '3.12']
20+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
2121
use_pre: ["", "--pre"]
2222

2323
steps:
@@ -27,7 +27,7 @@ jobs:
2727
sudo apt-get install jq
2828
2929
- name: Checkout repo
30-
uses: actions/checkout@v4.2.2
30+
uses: actions/checkout@v5.0.0
3131
with:
3232
fetch-depth: 0
3333

.github/workflows/conda-package.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
python: ["3.9", "3.10", "3.11", "3.12"]
21+
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
2222
steps:
2323
- name: Cancel Previous Runs
2424
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2525
with:
2626
access_token: ${{ github.token }}
27-
- uses: actions/checkout@v4.2.2
27+
- uses: actions/checkout@v5.0.0
2828
with:
2929
fetch-depth: 0
3030

@@ -48,7 +48,7 @@ jobs:
4848
run: echo $CONDA/bin >> $GITHUB_PATH
4949

5050
- name: Install conda-build
51-
run: conda install conda-build python=3.12
51+
run: conda install conda-build
5252

5353
- name: Build conda package
5454
run: |
@@ -75,7 +75,7 @@ jobs:
7575

7676
strategy:
7777
matrix:
78-
python: ["3.9", "3.10", "3.11", "3.12"]
78+
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
7979
experimental: [false]
8080
runner: [ubuntu-latest]
8181
continue-on-error: ${{ matrix.experimental }}
@@ -84,13 +84,13 @@ jobs:
8484

8585
steps:
8686
- name: Download artifact
87-
uses: actions/download-artifact@v4
87+
uses: actions/download-artifact@v5
8888
with:
8989
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
9090
- name: Add conda to system path
9191
run: echo $CONDA/bin >> $GITHUB_PATH
9292
- name: Install conda-build
93-
run: conda install conda-build python=3.12
93+
run: conda install conda-build
9494
- name: Create conda channel
9595
run: |
9696
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
@@ -146,15 +146,15 @@ jobs:
146146

147147
strategy:
148148
matrix:
149-
python: ["3.9", "3.10", "3.11", "3.12"]
149+
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
150150
env:
151151
conda-bld: C:\Miniconda\conda-bld\win-64\
152152
steps:
153153
- name: Cancel Previous Runs
154154
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
155155
with:
156156
access_token: ${{ github.token }}
157-
- uses: actions/checkout@v4.2.2
157+
- uses: actions/checkout@v5.0.0
158158
with:
159159
fetch-depth: 0
160160

@@ -187,7 +187,7 @@ jobs:
187187
- name: Install conda build
188188
run: |
189189
conda activate
190-
conda install -y conda-build python=3.12
190+
conda install -y conda-build
191191
conda list -n base
192192
193193
- name: Build conda package
@@ -209,7 +209,7 @@ jobs:
209209
shell: cmd /C CALL {0}
210210
strategy:
211211
matrix:
212-
python: ["3.9", "3.10", "3.11", "3.12"]
212+
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
213213
experimental: [false]
214214
runner: [windows-latest]
215215
continue-on-error: ${{ matrix.experimental }}
@@ -219,7 +219,7 @@ jobs:
219219

220220
steps:
221221
- name: Download artifact
222-
uses: actions/download-artifact@v4
222+
uses: actions/download-artifact@v5
223223
with:
224224
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
225225

.github/workflows/openssf-scorecard.yml

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

3737
steps:
3838
- name: "Checkout code"
39-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
39+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040
with:
4141
persist-credentials: false
4242

@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
74+
uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.8
7575
with:
7676
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
* Added mkl implementation for floating point data-types of `exp2`, `log2`, `fabs`, `copysign`, `nextafter`, `fmax`, `fmin` and `remainder` functions [gh-81](https://github.com/IntelPython/mkl_umath/pull/81)
1111
* Added mkl implementation for complex data-types of `conjugate` and `absolute` functions [gh-86](https://github.com/IntelPython/mkl_umath/pull/86)
12+
* Enabled support of Python 3.13 [gh-101](https://github.com/IntelPython/mkl_umath/pull/101)
1213

1314
## [0.2.0] (06/03/2025)
1415
This release updates `mkl_umath` to be aligned with both numpy-1.26.x and numpy-2.x.x.

conda-recipe-cf/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "0.2.0" %}
1+
{% set version = "0.3.0dev0" %}
22
{% set buildnumber = 0 %}
33

44
package:

conda-recipe/meta.yaml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
{% set version = "0.2.0" %}
2-
{% set buildnumber = 0 %}
3-
41
package:
52
name: mkl_umath
6-
version: {{ version }}
3+
version: {{ GIT_DESCRIBE_TAG }}
74

85
source:
96
path: ../
107

118
build:
12-
number: {{ buildnumber }}
9+
number: {{ GIT_DESCRIBE_NUMBER }}
10+
script_env:
11+
- WHEELS_OUTPUT_FOLDER
1312
ignore_run_exports:
1413
- blas
1514

@@ -30,10 +29,12 @@ requirements:
3029
- mkl-devel
3130
- tbb-devel
3231
- numpy-base
32+
- wheel >=0.41.3
3333
run:
3434
- python
35+
- mkl-service
3536
- {{ pin_compatible('intel-cmplr-lib-rt') }}
36-
- {{ pin_compatible('numpy') }}
37+
- {{ pin_compatible('numpy-base') }}
3738

3839
test:
3940
requires:
@@ -49,6 +50,15 @@ test:
4950

5051
about:
5152
home: http://github.com/IntelPython/mkl_umath
52-
license: BSD-3
53+
license: BSD-3-Clause
5354
license_file: LICENSE.txt
5455
summary: Universal functions for real and complex floating point arrays powered by Intel(R) Math Kernel Library Vector (Intel(R) MKL) and Intel(R) Short Vector Math Library (Intel(R) SVML)
56+
description: |
57+
<strong>LEGAL NOTICE: Use of this software package is subject to the
58+
software license agreement (as set forth above, in the license section of
59+
the installed Conda package and/or the README file) and all notices,
60+
disclaimers or license terms for third party or open source software
61+
included in or with the software.</strong>
62+
<br/><br/>
63+
EULA: <a href="https://opensource.org/licenses/BSD-3-Clause" target="_blank">BSD-3-Clause</a>
64+
<br/><br/>

mkl_umath/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.2.0'
1+
__version__ = '0.3.0dev0'

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ classifiers = [
4949
"Programming Language :: Python :: 3.10",
5050
"Programming Language :: Python :: 3.11",
5151
"Programming Language :: Python :: 3.12",
52+
"Programming Language :: Python :: 3.13",
5253
"Programming Language :: Python :: Implementation :: CPython",
5354
"Topic :: Software Development",
5455
"Topic :: Scientific/Engineering",
@@ -63,7 +64,7 @@ keywords = ["mkl_umath"]
6364
license = "BSD-3-Clause"
6465
name = "mkl_umath"
6566
readme = {file = "README.md", content-type = "text/markdown"}
66-
requires-python = ">=3.9,<3.13"
67+
requires-python = ">=3.9,<3.14"
6768

6869

6970
[project.optional-dependencies]

0 commit comments

Comments
 (0)