Migrate random to `pyproject.toml` from `setup.py` #62

ndgrigorian · 2025-04-13T08:00:27Z

This PR migrates mkl_random to pyproject.toml from setup.py

Also adjusts build system, removing mkl-service as a test requirement (it was previously added as part of a work-around, which was removed) and moves to use python -m pip install in build scripts instead of calling setup.py and updates min NumPy version

Prevents deprecation warning when building

Already a run dependency

Use no-deps to use oneAPI in environment

ndgrigorian · 2025-04-13T19:54:48Z

@vtavana
For some reason, including the project.license field in pyproject.toml causes builds to fail citing [REDACTED: solved the problem, setuptools needed to be pinned in the CI, oops!]

configuration error: `project.license` must be valid exactly by one definition (2 matches found):

    - keys:
        'file': {type: string}
      required: ['file']
    - keys:
        'text': {type: string}
      required: ['text']

did you see this at all with mkl_fft? Only happens in CI as well...

ndgrigorian · 2025-04-13T20:35:15Z

@ekomarova
I've updated the build scripts here (similar to some previous changes in mkl_fft) to avoid directly calling setup.py since it's been deprecated for years anyway

Also fix formatting in pyproject.toml

ekomarova · 2025-04-14T11:42:20Z

Thanks, @ndgrigorian! As soon as there is a tag that includes these changes, I can rebuild mkl_random to include this in the internal recipe

setup.py

pyproject.toml

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

README.md

Co-authored-by: Vahid Tavanashad <[email protected]>

avoids call to deprecated `get_info` from numpy.distutils

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

.github/workflows/conda-package.yml

vtavana

Thank you, @ndgrigorian!

antonwolfy · 2025-04-16T11:35:42Z

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

@@ -52,7 +53,7 @@ jobs:
      - name: Install mkl_random dependencies
        shell: bash -l {0}
        run: |
-          pip install cython setuptools pytest pytest-cov
+          pip install cython setuptools">=70.1" wheel


There is setuptools">=77" in other places. Was it intended to have a bit different dependency?

antonwolfy · 2025-04-16T11:36:44Z

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

@@ -52,7 +53,7 @@ jobs:
      - name: Install mkl_random dependencies
        shell: bash -l {0}
        run: |
-          pip install cython setuptools pytest pytest-cov
+          pip install cython setuptools">=70.1" wheel


Do we need to update docs/source/maintenance/index.rst also with min setuptools version required?

vtavana · 2025-04-16T14:20:09Z

.github/workflows/build-docs.yml

          architecture: x64
      - name: Install sphinx dependencies
        if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
        shell: bash -l {0}
        run: |
-          pip install numpy cython setuptools scikit-build cmake sphinx sphinx_rtd_theme furo pydot graphviz sphinxcontrib-programoutput sphinxcontrib-googleanalytics sphinx_design
+          pip install numpy cython setuptools">=77" scikit-build cmake sphinx sphinx_rtd_theme furo pydot graphviz sphinxcontrib-programoutput sphinxcontrib-googleanalytics sphinx_design
      - name: Checkout repo
        uses: actions/[email protected]
        with:


on line 56, we have python setup.py develop should we replace with pip install like other places?

ndgrigorian added 2 commits March 25, 2025 10:21

Update workflows to use .conda for conda package builds

1424a66

Use --numpy 2.0

1c57577

ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from 14569bf to 057f53c Compare April 13, 2025 08:01

ndgrigorian added 9 commits April 13, 2025 11:24

Add pyproject.toml and migrate from setup.py

c9985b6

Add build instructions to README

973bc11

Clean up pyproject.toml

c8e1e8e

Pin setuptools to greater than 77

1e56300

Prevents deprecation warning when building

Fix Conda package workflows on PRs

77623ac

Remove numpy as dependency for tests

ad3e36f

Already a run dependency

Remove mkl-service as test requirement

5dcd153

Change pip to install in build scripts

3f0a9bc

Remove license family

091f047

ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from 057f53c to 091f047 Compare April 13, 2025 18:24

ndgrigorian added 2 commits April 13, 2025 11:40

Install with pip in clang build

fd2db66

Use no-deps to use oneAPI in environment

Install wheel package in clang builds

3785633

ndgrigorian mentioned this pull request Apr 13, 2025

Update workflows to use .conda for conda package builds #59

Closed

ndgrigorian requested a review from vtavana April 13, 2025 19:54

ndgrigorian changed the title ~~Migrate random to pyproject toml from setup.py~~ Migrate random to pyproject.toml from setup.py Apr 13, 2025

ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from 5ab1a3c to 9abf583 Compare April 13, 2025 20:22

Pin setuptools in CI to >=77

b9544d8

ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from 9abf583 to b9544d8 Compare April 13, 2025 20:28

ndgrigorian marked this pull request as ready for review April 13, 2025 20:32

ndgrigorian requested review from antonwolfy, xaleryb and ekomarova as code owners April 13, 2025 20:32

Adjust pyproject.toml and setup.py license headers

bfd597a

Also fix formatting in pyproject.toml

vtavana reviewed Apr 14, 2025

View reviewed changes

setup.py Outdated Show resolved Hide resolved

setup.py Show resolved Hide resolved

pyproject.toml Show resolved Hide resolved

vtavana reviewed Apr 14, 2025

View reviewed changes

.github/workflows/build-with-clang.yml Outdated Show resolved Hide resolved

.github/workflows/build-with-clang.yml Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

ndgrigorian and others added 7 commits April 14, 2025 09:55

Update README.md

6fed4ac

Co-authored-by: Vahid Tavanashad <[email protected]>

Raise ValueError if MKLROOT variable is not set

43351fe

avoids call to deprecated `get_info` from numpy.distutils

Remove insertion of setup.py in path

5c960bc

Apply review comments to clang workflow

663c8b9

remove defaults channel

96ff214

Add openmp as explicit dependency in test_windows step

91ab5ba

Run conda-package workflow on 3.11 and 3.12 as well

31e878c

vtavana reviewed Apr 15, 2025

View reviewed changes

.github/workflows/conda-package-cf.yml Show resolved Hide resolved

vtavana reviewed Apr 15, 2025

View reviewed changes

.github/workflows/conda-package.yml Show resolved Hide resolved

ndgrigorian added 2 commits April 14, 2025 22:03

Run all workflows on all supported Python versions

b86fa8a

Run docs workflow on Python 3.12

bca1fd8

vtavana approved these changes Apr 15, 2025

View reviewed changes

vtavana mentioned this pull request Apr 16, 2025

fix test windows in CI IntelPython/mkl-service#63

Open

antonwolfy reviewed Apr 16, 2025

View reviewed changes

vtavana reviewed Apr 16, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate random to `pyproject.toml` from `setup.py` #62

Migrate random to `pyproject.toml` from `setup.py` #62

ndgrigorian commented Apr 13, 2025 •

edited

Loading

ndgrigorian commented Apr 13, 2025 •

edited

Loading

ndgrigorian commented Apr 13, 2025

ekomarova commented Apr 14, 2025

vtavana left a comment

antonwolfy Apr 16, 2025

antonwolfy Apr 16, 2025

vtavana Apr 16, 2025

Migrate random to pyproject.toml from setup.py #62

Are you sure you want to change the base?

Migrate random to pyproject.toml from setup.py #62

Conversation

ndgrigorian commented Apr 13, 2025 • edited Loading

ndgrigorian commented Apr 13, 2025 • edited Loading

ndgrigorian commented Apr 13, 2025

ekomarova commented Apr 14, 2025

vtavana left a comment

Choose a reason for hiding this comment

antonwolfy Apr 16, 2025

Choose a reason for hiding this comment

antonwolfy Apr 16, 2025

Choose a reason for hiding this comment

vtavana Apr 16, 2025

Choose a reason for hiding this comment

Migrate random to `pyproject.toml` from `setup.py` #62

Migrate random to `pyproject.toml` from `setup.py` #62

ndgrigorian commented Apr 13, 2025 •

edited

Loading

ndgrigorian commented Apr 13, 2025 •

edited

Loading