From c1cd962ea04353a22e221d736c91fbaaec5e3e5a Mon Sep 17 00:00:00 2001 From: Charles Coulombe Date: Fri, 22 Sep 2023 15:16:16 -0400 Subject: [PATCH 1/2] Added cmake constraint. Force our dummy wheel or fail for version above. --- python/constraints.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/python/constraints.txt b/python/constraints.txt index 6b2c919..4c43a48 100644 --- a/python/constraints.txt +++ b/python/constraints.txt @@ -1 +1,2 @@ pip <= 18.1; python_version < '3' +cmake==3.23.1+dummy.computecanada # Force our dummy wheel or fail for version above From b8ffde99acb9fc746c88f648d726a854362fe415 Mon Sep 17 00:00:00 2001 From: Charles Coulombe Date: Wed, 24 Apr 2024 10:16:53 -0400 Subject: [PATCH 2/2] Added cmake constraints for 2020 and 2023 config files. Added `constraints-cmake.txt` file Keep but emptied `constraints-buildnode.txt` in case we like to add new constraints only on build-node Updated 2020 and 2023 pip config files to use constraints-cmake.txt file --- python/constraints-buildnode.txt | 5 +---- python/constraints-cmake.txt | 4 ++++ python/pip-avx-gentoo2020.conf | 3 +-- python/pip-avx2-gentoo2020.conf | 3 +-- python/pip-avx512-gentoo2020.conf | 3 +-- python/pip-generic-gentoo2020.conf | 3 +-- python/pip-gentoo.conf | 3 +-- python/pip-sse3-gentoo2020.conf | 3 +-- python/pip-x86-64-v3-gentoo2023.conf | 3 +-- python/pip-x86-64-v4-gentoo2023.conf | 3 +-- 10 files changed, 13 insertions(+), 20 deletions(-) create mode 100644 python/constraints-cmake.txt diff --git a/python/constraints-buildnode.txt b/python/constraints-buildnode.txt index d839b52..8b13789 100644 --- a/python/constraints-buildnode.txt +++ b/python/constraints-buildnode.txt @@ -1,4 +1 @@ -# Force our dummy wheel or fail otherwise -cmake>=3.23.1+dummy.computecanada -cmake<=3.27.7+dummy.computecanada -cmake !=3.24.*,!=3.25.*,!=3.26.* + diff --git a/python/constraints-cmake.txt b/python/constraints-cmake.txt new file mode 100644 index 0000000..d839b52 --- /dev/null +++ b/python/constraints-cmake.txt @@ -0,0 +1,4 @@ +# Force our dummy wheel or fail otherwise +cmake>=3.23.1+dummy.computecanada +cmake<=3.27.7+dummy.computecanada +cmake !=3.24.*,!=3.25.*,!=3.26.* diff --git a/python/pip-avx-gentoo2020.conf b/python/pip-avx-gentoo2020.conf index 11a908b..deda92c 100644 --- a/python/pip-avx-gentoo2020.conf +++ b/python/pip-avx-gentoo2020.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/avx /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/avx /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true - diff --git a/python/pip-avx2-gentoo2020.conf b/python/pip-avx2-gentoo2020.conf index 4d88ac2..8afdd92 100644 --- a/python/pip-avx2-gentoo2020.conf +++ b/python/pip-avx2-gentoo2020.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/avx2 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/avx2 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true - diff --git a/python/pip-avx512-gentoo2020.conf b/python/pip-avx512-gentoo2020.conf index 07540ff..4383555 100644 --- a/python/pip-avx512-gentoo2020.conf +++ b/python/pip-avx512-gentoo2020.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/avx512 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/avx512 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/avx2 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/avx2 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true - diff --git a/python/pip-generic-gentoo2020.conf b/python/pip-generic-gentoo2020.conf index d89478a..555882e 100644 --- a/python/pip-generic-gentoo2020.conf +++ b/python/pip-generic-gentoo2020.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/sse3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/sse3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true - diff --git a/python/pip-gentoo.conf b/python/pip-gentoo.conf index d89478a..555882e 100644 --- a/python/pip-gentoo.conf +++ b/python/pip-gentoo.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/sse3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/sse3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true - diff --git a/python/pip-sse3-gentoo2020.conf b/python/pip-sse3-gentoo2020.conf index d89478a..555882e 100644 --- a/python/pip-sse3-gentoo2020.conf +++ b/python/pip-sse3-gentoo2020.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/sse3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/sse3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2020/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true - diff --git a/python/pip-x86-64-v3-gentoo2023.conf b/python/pip-x86-64-v3-gentoo2023.conf index c8ab128..8a19ab3 100644 --- a/python/pip-x86-64-v3-gentoo2023.conf +++ b/python/pip-x86-64-v3-gentoo2023.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2023/x86-64-v3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2023/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true - diff --git a/python/pip-x86-64-v4-gentoo2023.conf b/python/pip-x86-64-v4-gentoo2023.conf index 7286b38..f486b80 100644 --- a/python/pip-x86-64-v4-gentoo2023.conf +++ b/python/pip-x86-64-v4-gentoo2023.conf @@ -10,8 +10,7 @@ disable-pip-version-check = true [install] find-links = /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2023/x86-64-v4 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2023/x86-64-v3 /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/gentoo2023/generic /cvmfs/soft.computecanada.ca/custom/python/wheelhouse/generic -constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt +constraint = /cvmfs/soft.computecanada.ca/config/python/constraints.txt /cvmfs/soft.computecanada.ca/config/python/constraints-cmake.txt only-binary = numpy,scipy,mpi4py,pandas,h5py,Cython,grpcio prefer-binary = true disable-pip-version-check = true -