Merge branch 'master' into hasDimension

SINTEF · Dec 13, 2024 · 9b03049 · 9b03049
2 parents d567110 + d3d58af
commit 9b03049
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 22 deletions.
diff --git a/.github/docker/Dockerfile-manylinux.template b/.github/docker/Dockerfile-manylinux.template
@@ -7,7 +7,7 @@
 # Usage:
 #
 # Copy this template file and replace:
-# - `{{ TYPE }}` major glibc version, ex: _2_24, _2_28
+# - `{{ TYPE }}` major glibc version, ex: 1, 2010, 2014
 # - `{{ ARCH }}` architecture, ex:  x86_64, i686
 # - `{{ PY_MINORS }}` minor Python3 version numbers, ex: "8 9 10"
 # - `{{ EXTRA_PRE }}` extra commands before installation

diff --git a/.github/docker/Dockerfile-musllinux.template b/.github/docker/Dockerfile-musllinux.template
@@ -42,7 +42,7 @@ COPY requirements.txt requirements_full.txt requirements_dev.txt /tmp/
 # Do not use distutils distributed with setuptools
 # This is due to base changes in the distutils API, removing msvccompiler,
 # which is necessary for building the numpy wheel.
-ENV SETUPTOOLS_USE_DISTUTILS="stdlib"
+#ENV SETUPTOOLS_USE_DISTUTILS="stdlib"
 
 RUN \
   apk add -u \

diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml
@@ -96,7 +96,7 @@ jobs:
 
           # 64-bit musllinux
           - os: ubuntu-20.04
-            system_type: ["musllinux", "_1_1"]
+            system_type: ["musllinux", "_1_2"]
             arch: x86_64
             py_minors: 8,9,10,11
           #- os: ubuntu-20.04
@@ -120,7 +120,7 @@ jobs:
 
           # 32-bit musllinux
           - os: ubuntu-20.04
-            system_type: ["musllinux", "_1_1"]
+            system_type: ["musllinux", "_1_2"]
             arch: i686
             py_minors: 8,9,10,11
 

diff --git a/.github/workflows/container_builds_weekly.yml b/.github/workflows/container_builds_weekly.yml
@@ -26,8 +26,7 @@ jobs:
         - system: "manylinux"
           type: "_2_34"
           arch: "x86_64"
-          #py_minors: "8 9 10 11 12 13"
-          py_minors: "8 9 10 11 12"
+          py_minors: "8 9 10 11 12 13"
         #- system: "manylinux"
         #  type: "_2_28"
         #  arch: "x86_64"
@@ -45,8 +44,7 @@ jobs:
         - system: "musllinux"
           type: "_1_2"
           arch: "x86_64"
-          #py_minors: "8 9 10 11 12 13"
-          py_minors: "8 9 10 11"
+          py_minors: "8 9 10 11 12 13"
         #- system: "musllinux"
         #  type: "_1_1"
         #  arch: "x86_64"
@@ -60,19 +58,18 @@ jobs:
         - system: "manylinux"
           type: "2014"
           arch: "i686"
-          #py_minors: "8 9 10 11 12 13"
-          py_minors: "10 11 12"
+          py_minors: "10 11 12 13"
         #- system: "manylinux"
         #  type: "2010"
         #  arch: "i686"
         #  py_minors: "8 9"
 
         # 32-bit musllinux
+        # Seems that pyyaml depends on distutils, which is only available on Python 3.11 and below
         - system: "musllinux"
           type: "_1_2"
           arch: "i686"
-          #py_minors: "8 9 10 11 12 13"
-          py_minors: "8 9 10 11"
+          py_minors: "9 10 11"
         #- system: "musllinux"
         #  type: "_1_1"
         #  arch: "i686"

diff --git a/doc/getting_started/installation.md b/doc/getting_started/installation.md
@@ -37,8 +37,8 @@ wheels are shown in the following table.
 |------------------|--------|-----|-----|------|------|------|
 | [manylinux_2_34] | x86_64 | x   | x   | x    | x    | x    |
 | [manylinux2014]  | i686   |     |     | x    | x    | x    |
-| [musllinux_1_2]  | x86_64 | x   | x   | x    | x    |      |
-| [musllinux_1_2]  | i686   | x   | x   | x    | x    |      |
+| [musllinux_1_2]  | x86_64 | x   | x   | x    | x    | x    |
+| [musllinux_1_2]  | i686   |     | x   | x    | x    |      |
 | windows          | x86_64 | x   | x   | x    | x    | x    |
 
 

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -1,24 +1,37 @@
 [build-system]
-  requires = [
-    "setuptools>=58",
-    "wheel>=0.37",
-    "numpy>=1.14.5,<2.1.3",
-    "cmake==3.31.1",
-    "swig==4.1.1",
-  ]
+requires = [
+  "setuptools>=58",
+  "wheel>=0.37",
+  "numpy>=1.14.5,<2.1.3",
+  "cmake==3.31.1",
+  "swig==4.1.1",
+]
+
+
+#requires = [
+#  #"setuptools>=58; python_version<'3.12'",
+#  #"wheel>=0.37; python_version<'3.12'",
+#  "setuptools==67.6.1; python_version<'3.9'",
+#  "setuptools>=68.2.1; python_version>='3.9'",
+#  "wheel>=0.37",
+#  "numpy>=1.14.5,<2.1.3",
+#  "cmake==3.31.1",
+#  "swig==4.1.1",
+#]
 build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
 build-frontend = "pip"
 build-verbosity = 1
 
 [tool.cibuildwheel.windows]
-before-test = "python -m pip install -r {project}\\requirements.txt"
+before-test = "python -m pip install -r {project}\\requirements.txt -r {project}\\requirements_dev.txt"
 test-command = "python {package}\\..\\bindings\\python\\tests\\test_python_bindings.py"
 
 [tool.cibuildwheel.linux]
 environment-pass = ["CI_BUILD_CMAKE_ARGS", "CI_PIP_CACHE_DIR"]
 before-build = [
+  #"python -m pip install --cache-dir /ci/pip_cache --prefer-binary -r {project}/requirements.txt -r {project}/requirements_dev.txt",
   "rm -rf {project}/python/build/temp*",
   "export PYVER=$(python -c \"import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')\")",
   "export ABITAG=$(python -c \"import sys; cp=f'cp{sys.version_info.major}{sys.version_info.minor}'; print(f'{cp}-{cp}{sys.abiflags}')\")",

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,6 +1,8 @@
 # Requirements building
 swig==4.3.0
 cmake==3.31.1
+setuptools==67.6.1; python_version<"3.9"
+setuptools>=68.2.1; python_version>="3.9"
 
 # Requirements for running tests
 mongomock>=4.1.2,<5