From 0d4f2f7495bca0e14c2b28e285cb50d5b6277749 Mon Sep 17 00:00:00 2001 From: abhi-jha Date: Wed, 17 Apr 2024 00:43:19 +0200 Subject: [PATCH 1/3] MNT: Add meson-python, numpy, pybind11 and setuptools-scm in requirements/doc/doc-requirements.txt * Update the CI build files to refer to the requirments file rather than installing dependencies manually --- .circleci/config.yml | 2 +- azure-pipelines.yml | 2 +- requirements/dev/build-requirements.txt | 6 ++++++ requirements/dev/dev-requirements.txt | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 requirements/dev/build-requirements.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ab22d302314..5b4cbf5570b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,7 +103,7 @@ commands: - run: name: Install Python dependencies command: | - python -m pip install --user meson-python numpy pybind11 setuptools-scm + python -m pip install --user -r requirements/dev/build-requirements.txt python -m pip install --user \ numpy<< parameters.numpy_version >> \ -r requirements/doc/doc-requirements.txt diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bf055d0eaa16..e3d04faf5997 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -135,7 +135,7 @@ stages: - bash: | python -m pip install --upgrade pip - python -m pip install --upgrade meson-python numpy pybind11 setuptools-scm + python -m pip install --upgrade -r requirements/dev/build-requirements.txt python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt displayName: 'Install dependencies with pip' diff --git a/requirements/dev/build-requirements.txt b/requirements/dev/build-requirements.txt new file mode 100644 index 000000000000..92e8abb2b889 --- /dev/null +++ b/requirements/dev/build-requirements.txt @@ -0,0 +1,6 @@ +pybind11 +meson-python +cmake +ninja +numpy +setuptools-scm diff --git a/requirements/dev/dev-requirements.txt b/requirements/dev/dev-requirements.txt index 117fd8acd3e6..e5cbc1091bb2 100644 --- a/requirements/dev/dev-requirements.txt +++ b/requirements/dev/dev-requirements.txt @@ -1,3 +1,4 @@ +-r build-requirements.txt -r ../doc/doc-requirements.txt -r ../testing/all.txt -r ../testing/extra.txt From 0804fdaca6179c9ddc675def1cc60d43bcd6b2db Mon Sep 17 00:00:00 2001 From: abhi-jha Date: Wed, 15 May 2024 11:20:02 +0200 Subject: [PATCH 2/3] Remove ninja dependency --- requirements/dev/build-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/dev/build-requirements.txt b/requirements/dev/build-requirements.txt index 92e8abb2b889..beeddbc65f7e 100644 --- a/requirements/dev/build-requirements.txt +++ b/requirements/dev/build-requirements.txt @@ -1,6 +1,5 @@ pybind11 meson-python cmake -ninja numpy setuptools-scm From 924e3f159fd110ec92d23204e7caf10244480137 Mon Sep 17 00:00:00 2001 From: abhi-jha Date: Wed, 15 May 2024 23:37:58 +0200 Subject: [PATCH 3/3] Remove cmake dependency --- requirements/dev/build-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/dev/build-requirements.txt b/requirements/dev/build-requirements.txt index beeddbc65f7e..1b22d228e217 100644 --- a/requirements/dev/build-requirements.txt +++ b/requirements/dev/build-requirements.txt @@ -1,5 +1,4 @@ pybind11 meson-python -cmake numpy setuptools-scm