Skip to content

Commit 4ba1123

Browse files
authored
Merge branch 'master' into task/coverity
2 parents c6effe4 + 150a3f7 commit 4ba1123

8 files changed

Lines changed: 51 additions & 61 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,18 @@ updates:
66
interval: "weekly"
77
day: "saturday"
88
rebase-strategy: "disabled"
9+
labels: ["autoupdate"]
10+
groups:
11+
github-actions:
12+
patterns: ["*"]
13+
14+
- package-ecosystem: "pre-commit"
15+
directory: "/"
16+
schedule:
17+
interval: "weekly"
18+
day: "saturday"
19+
rebase-strategy: "disabled"
20+
labels: ["autoupdate"]
21+
groups:
22+
pre-commit:
23+
patterns: ["*"]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Cancel Previous Runs
28-
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
28+
uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # 0.13.1
2929
with:
3030
access_token: ${{ github.token }}
3131

@@ -35,13 +35,13 @@ jobs:
3535
sudo apt-get install -y clang
3636
3737
- name: Setup Python
38-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
38+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
3939
with:
4040
python-version: ${{ matrix.python }}
4141
architecture: x64
4242

4343
- name: Checkout repo
44-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
44+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4545
with:
4646
fetch-depth: 0
4747

‎.github/workflows/openssf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
72+
uses: github/codeql-action/upload-sarif@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
7373
with:
7474
sarif_file: results.sarif

‎.github/workflows/pre-commit-autoupdate.yml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ repos:
112112
- id: shellcheck
113113

114114
- repo: https://github.com/gitleaks/gitleaks
115-
rev: v8.30.0
115+
rev: v8.30.1
116116
hooks:
117117
- id: gitleaks
118118

‎CHANGELOG.md‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
## [dev] - YYYY-MM-DD
88

99
### Added
10-
* Added CLI for persistent and ephemeral NumPy FFT patching: `python -m mkl_fft patch install/uninstall/status` for persistent patching across all Python sessions, and `python -m mkl_fft with_patch <command>` for one-shot execution with MKL acceleration [gh-319](https://github.com/IntelPython/mkl_fft/pull/319)
1110

1211
### Changed
13-
* Removed `numpy-base` dependency and `USE_NUMPY_BASE` environment variable from conda recipe [gh-318](https://github.com/IntelPython/mkl_fft/pull/318)
1412

1513
### Fixed
1614

15+
## [2.3.2] - 2026-08-04
16+
17+
### Fixed
18+
* Emit one `-rpath` linker argument per path instead of colon-joining them, so the runtime library search path is baked correctly into macOS (Mach-O) extensions [gh-358](https://github.com/IntelPython/mkl_fft/pull/358)
19+
20+
## [2.3.1] - 2026-07-31
21+
22+
### Fixed
23+
* Fixed RPATH logic for OSX builds [gh-351](https://github.com/IntelPython/mkl_fft/pull/351)
24+
25+
## [2.3.0] - 2026-07-30
26+
27+
### Added
28+
* Added CLI for persistent and ephemeral NumPy FFT patching: `python -m mkl_fft patch install/uninstall/status` for persistent patching across all Python sessions, and `python -m mkl_fft with_patch <command>` for one-shot execution with MKL acceleration [gh-319](https://github.com/IntelPython/mkl_fft/pull/319)
29+
30+
### Changed
31+
* Removed `numpy-base` dependency and `USE_NUMPY_BASE` environment variable from conda recipe [gh-318](https://github.com/IntelPython/mkl_fft/pull/318)
32+
* Migrated the build system from `setuptools` to `meson-python`, removing `setup.py` in favor of `meson.build` [gh-303](https://github.com/IntelPython/mkl_fft/pull/303)
33+
1734
## [2.2.1] - 2026-05-11
1835

1936
### Fixed

‎meson.build‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,17 @@ cc = meson.get_compiler('c')
2929
c_args = ['-DNDEBUG']
3030

3131
rpath_link_args = []
32-
if host_machine.system() == 'linux'
33-
rpath = '$ORIGIN' / '../..' + ':' + '$ORIGIN' / '../../..'
34-
rpath_link_args = ['-Wl,-rpath,' + rpath]
32+
if host_machine.system() != 'windows'
33+
if host_machine.system() == 'darwin'
34+
origin = '@loader_path'
35+
else
36+
origin = '$ORIGIN'
37+
endif
38+
39+
rpath_link_args = [
40+
'-Wl,-rpath,' + origin / '../..',
41+
'-Wl,-rpath,' + origin / '../../..',
42+
]
3543
endif
3644

3745
mkl_dep = dependency('MKL', method: 'cmake',

‎mkl_fft/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.3.0dev0"
1+
__version__ = "2.4.0dev0"

0 commit comments

Comments
 (0)