Skip to content

Commit 8e2cb87

Browse files
jharlow-inteljharlow-intel
committed
Merge remote-tracking branch 'origin/master' into dev-milestone
2 parents 851daa2 + 61d97d2 commit 8e2cb87

File tree

10 files changed

+79
-42
lines changed

10 files changed

+79
-42
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @ndgrigorian @antonwolfy @xaleryb @ekomarova
1+
* @ndgrigorian @antonwolfy @xaleryb @jharlow-intel

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
16-
numpy_version: ["numpy'<2'", "numpy'>=2'"]
15+
python: ["3.10", "3.11", "3.12", "3.13"]
16+
numpy_version: ["numpy'>=2'"]
1717
env:
1818
ONEAPI_ROOT: /opt/intel/oneapi
1919

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

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
python: ["3.9", "3.10", "3.11", "3.12"]
22+
include:
23+
- python: "3.10"
24+
numpy: "2.2"
25+
- python: "3.11"
26+
numpy: "2.3"
27+
- python: "3.12"
28+
numpy: "2.3"
29+
- python: "3.13"
30+
numpy: "2.3"
2331
steps:
2432
- uses: actions/checkout@v4
2533
with:
@@ -47,7 +55,7 @@ jobs:
4755
- name: Build conda package
4856
run: |
4957
CHANNELS="-c conda-forge --override-channels"
50-
VERSIONS="--python ${{ matrix.python }} --numpy 2.0"
58+
VERSIONS="--python ${{ matrix.python }} --numpy ${{ matrix.numpy }}"
5159
TEST="--no-test"
5260
5361
conda build \
@@ -66,7 +74,15 @@ jobs:
6674

6775
strategy:
6876
matrix:
69-
python: ["3.9", "3.10", "3.11", "3.12"]
77+
include:
78+
- python: "3.10"
79+
numpy: "2.2"
80+
- python: "3.11"
81+
numpy: "2.3"
82+
- python: "3.12"
83+
numpy: "2.3"
84+
- python: "3.13"
85+
numpy: "2.3"
7086
env:
7187
conda-bld: C:\Miniconda\conda-bld\win-64\
7288
steps:
@@ -95,7 +111,7 @@ jobs:
95111
- name: Setup MSVC
96112
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
97113
- name: Build conda package
98-
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c conda-forge --override-channels conda-recipe-cf
114+
run: conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c conda-forge --override-channels conda-recipe-cf
99115
- name: Upload artifact
100116
uses: actions/upload-artifact@v4
101117
with:
@@ -104,15 +120,20 @@ jobs:
104120

105121
test_linux:
106122
needs: build_linux
107-
runs-on: ${{ matrix.runner }}
123+
runs-on: ubuntu-latest
108124

109125
strategy:
110126
matrix:
111-
python: ["3.9", "3.10", "3.11", "3.12"]
112-
numpy: ["1.26*", "2*"]
113-
experimental: [false]
114-
runner: [ubuntu-latest]
115-
continue-on-error: ${{ matrix.experimental }}
127+
include:
128+
- python: "3.10"
129+
numpy: "2.2"
130+
- python: "3.11"
131+
numpy: "2.3"
132+
- python: "3.12"
133+
numpy: "2.3"
134+
- python: "3.13"
135+
numpy: "2.3"
136+
116137
env:
117138
CHANNELS: -c conda-forge --override-channels
118139

@@ -172,15 +193,20 @@ jobs:
172193
173194
test_windows:
174195
needs: build_windows
175-
runs-on: ${{ matrix.runner }}
196+
runs-on: windows-latest
176197

177198
strategy:
178199
matrix:
179-
python: ["3.9", "3.10", "3.11", "3.12"]
180-
numpy: ["1.26*", "2*"]
181-
experimental: [false]
182-
runner: [windows-latest]
183-
continue-on-error: ${{ matrix.experimental }}
200+
include:
201+
- python: "3.10"
202+
numpy: "2.2"
203+
- python: "3.11"
204+
numpy: "2.3"
205+
- python: "3.12"
206+
numpy: "2.3"
207+
- python: "3.13"
208+
numpy: "2.3"
209+
184210
env:
185211
CHANNELS: -c conda-forge --override-channels
186212

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
python: ["3.9", "3.10", "3.11", "3.12"]
22+
python: ["3.10", "3.11", "3.12", "3.13"]
2323
steps:
2424
- uses: actions/checkout@v4
2525
with:
@@ -66,7 +66,7 @@ jobs:
6666

6767
strategy:
6868
matrix:
69-
python: ["3.9", "3.10", "3.11", "3.12"]
69+
python: ["3.10", "3.11", "3.12", "3.13"]
7070
env:
7171
conda-bld: C:\Miniconda\conda-bld\win-64\
7272
steps:
@@ -108,14 +108,14 @@ jobs:
108108
strategy:
109109
matrix:
110110
include:
111-
- python: '3.9'
112-
numpy: '1.26'
113-
- python: '3.10'
114-
numpy: '2.2'
115-
- python: '3.11'
116-
numpy: '2.2'
117-
- python: '3.12'
118-
numpy: '2.2'
111+
- python: "3.10"
112+
numpy: "2.2"
113+
- python: "3.11"
114+
numpy: "2.3"
115+
- python: "3.12"
116+
numpy: "2.3"
117+
- python: "3.13"
118+
numpy: "2.3"
119119
env:
120120
CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels
121121

@@ -180,14 +180,14 @@ jobs:
180180
strategy:
181181
matrix:
182182
include:
183-
- python: '3.9'
184-
numpy: '1.26'
185-
- python: '3.10'
186-
numpy: '2.2'
187-
- python: '3.11'
188-
numpy: '2.2'
189-
- python: '3.12'
190-
numpy: '2.2'
183+
- python: "3.10"
184+
numpy: "2.2"
185+
- python: "3.11"
186+
numpy: "2.3"
187+
- python: "3.12"
188+
numpy: "2.3"
189+
- python: "3.13"
190+
numpy: "2.3"
191191
env:
192192
CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels
193193

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [dev] (MM/DD/YYYY)
8+
9+
### Added
10+
* Enabled support of Python 3.14 [gh-79](https://github.com/IntelPython/mkl_random/pull/79)
11+
12+
### Removed
13+
* Dropped support for Python 3.9 [gh-81](https://github.com/IntelPython/mkl_random/pull/81)
14+
715
## [1.3.0] (10/06/2025)
816

917
### Changed

‎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 = "1.3.0" %}
1+
{% set version = "1.4.0dev0" %}
22
{% set buildnumber = 0 %}
33

44
package:

‎conda-recipe/meta.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ requirements:
1919
- {{ stdlib('c') }}
2020
host:
2121
- python
22+
- python-gil # [py>=314]
2223
- setuptools >=77
2324
- mkl-devel
2425
- cython
@@ -27,6 +28,7 @@ requirements:
2728
- wheel >=0.41.3
2829
run:
2930
- python
31+
- python-gil # [py>=314]
3032
- {{ pin_compatible('mkl', min_pin="x.x", max_pin="x") }}
3133
- {{ pin_compatible('numpy-base', min_pin="x.x", max_pin="x") }}
3234

‎docs/source/conf.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
project = 'mkl_random'
1010
copyright = '2017-2025, Intel Corp.'
1111
author = 'Intel Corp.'
12-
release = '1.3.0'
12+
release = '1.4.0dev0'
13+
1314

1415
# -- General configuration ---------------------------------------------------
1516
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

‎mkl_random/_version.py‎

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

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ classifiers = [
3838
"Programming Language :: C",
3939
"Programming Language :: Python",
4040
"Programming Language :: Python :: 3",
41-
"Programming Language :: Python :: 3.9",
4241
"Programming Language :: Python :: 3.10",
4342
"Programming Language :: Python :: 3.11",
4443
"Programming Language :: Python :: 3.12",
4544
"Programming Language :: Python :: 3.13",
45+
"Programming Language :: Python :: 3.14",
4646
"Programming Language :: Python :: Implementation :: CPython",
4747
"Topic :: Software Development",
4848
"Topic :: Scientific/Engineering",
@@ -59,7 +59,7 @@ keywords = ["MKL", "VSL", "true randomness", "pseudorandomness",
5959
license = "BSD-3-Clause"
6060
name = "mkl_random"
6161
readme = {file = "README.md", content-type = "text/markdown"}
62-
requires-python = ">=3.9,<3.14"
62+
requires-python = ">=3.10,<3.15"
6363

6464
[project.optional-dependencies]
6565
test = ["pytest"]

0 commit comments

Comments
 (0)