You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by jm...@apache.org on 2024/04/12 17:30:00 UTC

(datasketches-python) branch muslinux-wheels updated (20e723e -> 858b1a0)

This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a change to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git


    from 20e723e  Merge pull request #44 from apache/numpy-fix
     new 5f55e61  remove 32-bit wheel builds, add muslinux
     new 4a45c05  properly spell musllinux
     new f9b005f  try to remove unneeded yum command from musllinux
     new 43a13b6  move option back to workflow file
     new a20c423  keep arch options in pyproject.toml, only move before-build env option
     new 20ca42a  stop removing cmake to clean up script
     new 858b1a0  remove commented line

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/build_wheels.yml | 18 ++++++++++++------
 pyproject.toml                     |  3 +--
 2 files changed, 13 insertions(+), 8 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


(datasketches-python) 04/07: move option back to workflow file

Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git

commit 43a13b65545b2bef8fe123c9066969f81b14ae6b
Author: Jon <jm...@apache.org>
AuthorDate: Tue Apr 9 23:59:31 2024 -0700

    move option back to workflow file
---
 .github/workflows/build_wheels.yml |  4 +++-
 pyproject.toml                     | 10 +++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 28734dc..5daef5f 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -52,12 +52,14 @@ jobs:
         - {
             name: "Ubuntu Latest (x86_64, manylinux)",
             os: ubuntu-latest,
-            cibw-arch: manylinux_x86_64
+            cibw-arch: manylinux_x86_64,
+            CIBW_BEFORE_BUILD: "yum remove -y cmake"
           }
         - {
             name: "Ubuntu Latest (ARM64, manylinux)",
             os: ubuntu-latest,
             cibw-arch: manylinux_aarch64,
+            CIBW_BEFORE_BUILD: "yum remove -y cmake",
             use-qemu: true
           }
         - {
diff --git a/pyproject.toml b/pyproject.toml
index 0284419..7d514d9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,13 +30,9 @@ skip = ["cp36-*", "cp37-*", "pp*", "*-win32"]
 [tool.cibuildwheel.windows]
 archs = ["auto64"]
 
-[tool.cibuildwheel.linux]
-archs = ["auto", "aarch64"]
-before-build = "yum remove -y cmake"
-
-[[tool.cibuildwheel.overrides]]
-select = "*muslllinux*"
-before-build = ""
+#[tool.cibuildwheel.linux]
+#archs = ["auto", "aarch64"]
+#before-build = "yum remove -y cmake"
 
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


(datasketches-python) 07/07: remove commented line

Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git

commit 858b1a05105bf7521d058badd6a436d1515d52c3
Author: Jon Malkin <78...@users.noreply.github.com>
AuthorDate: Fri Apr 12 10:29:51 2024 -0700

    remove commented line
---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5f8e251..43a9f05 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,6 @@ archs = ["auto64"]
 
 [tool.cibuildwheel.linux]
 archs = ["auto", "aarch64"]
-#before-build = "yum remove -y cmake"
 
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


(datasketches-python) 03/07: try to remove unneeded yum command from musllinux

Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git

commit f9b005fcaf725bf03da36cf2c06837771ad71f70
Author: Jon <jm...@apache.org>
AuthorDate: Tue Apr 9 23:53:37 2024 -0700

    try to remove unneeded yum command from musllinux
---
 pyproject.toml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5c584ec..0284419 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ requires = ["wheel",
 build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
-build-verbosity = 0  # options: 1, 2, or 3 
+build-verbosity = 0  # options: 1, 2, or 3
 skip = ["cp36-*", "cp37-*", "pp*", "*-win32"]
 
 [tool.cibuildwheel.windows]
@@ -34,5 +34,9 @@ archs = ["auto64"]
 archs = ["auto", "aarch64"]
 before-build = "yum remove -y cmake"
 
+[[tool.cibuildwheel.overrides]]
+select = "*muslllinux*"
+before-build = ""
+
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


(datasketches-python) 02/07: properly spell musllinux

Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git

commit 4a45c058dd6ebb08225f00b87fd0fec78a8f5bf9
Author: Jon <jm...@apache.org>
AuthorDate: Tue Apr 9 23:37:25 2024 -0700

    properly spell musllinux
---
 .github/workflows/build_wheels.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 22b2772..28734dc 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -61,14 +61,14 @@ jobs:
             use-qemu: true
           }
         - {
-            name: "Ubuntu Latest (x86_64, muslinux)",
+            name: "Ubuntu Latest (x86_64, musllinux)",
             os: ubuntu-latest,
-            cibw-arch: muslinux_x86_64
+            cibw-arch: musllinux_x86_64
           }
         - {
-            name: "Ubuntu Latest (ARM64, muslinux)",
+            name: "Ubuntu Latest (ARM64, musllinux)",
             os: ubuntu-latest,
-            cibw-arch: muslinux_aarch64,
+            cibw-arch: musllinux_aarch64,
             use-qemu: true
           }
         - {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


(datasketches-python) 06/07: stop removing cmake to clean up script

Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git

commit 20ca42a29e2c9142897bfc1336392048b7b16e35
Author: Jon <jm...@apache.org>
AuthorDate: Wed Apr 10 00:17:00 2024 -0700

    stop removing cmake to clean up script
---
 .github/workflows/build_wheels.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 5daef5f..d808cc0 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -53,13 +53,11 @@ jobs:
             name: "Ubuntu Latest (x86_64, manylinux)",
             os: ubuntu-latest,
             cibw-arch: manylinux_x86_64,
-            CIBW_BEFORE_BUILD: "yum remove -y cmake"
           }
         - {
             name: "Ubuntu Latest (ARM64, manylinux)",
             os: ubuntu-latest,
             cibw-arch: manylinux_aarch64,
-            CIBW_BEFORE_BUILD: "yum remove -y cmake",
             use-qemu: true
           }
         - {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


(datasketches-python) 05/07: keep arch options in pyproject.toml, only move before-build env option

Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git

commit a20c423ac482a5f60a7e6d6bc77416454282c35c
Author: Jon <jm...@apache.org>
AuthorDate: Wed Apr 10 00:02:18 2024 -0700

    keep arch options in pyproject.toml, only move before-build env option
---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 7d514d9..5f8e251 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,8 +30,8 @@ skip = ["cp36-*", "cp37-*", "pp*", "*-win32"]
 [tool.cibuildwheel.windows]
 archs = ["auto64"]
 
-#[tool.cibuildwheel.linux]
-#archs = ["auto", "aarch64"]
+[tool.cibuildwheel.linux]
+archs = ["auto", "aarch64"]
 #before-build = "yum remove -y cmake"
 
 [tool.cibuildwheel.macos]


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


(datasketches-python) 01/07: remove 32-bit wheel builds, add muslinux

Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch muslinux-wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-python.git

commit 5f55e615da056ba84f9abd21454c965ebf3d629b
Author: Jon <jm...@apache.org>
AuthorDate: Tue Apr 9 23:33:19 2024 -0700

    remove 32-bit wheel builds, add muslinux
---
 .github/workflows/build_wheels.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index c7453e2..22b2772 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -2,7 +2,7 @@ name: Build Python Wheels
 
 on:
   workflow_dispatch:
-  
+
 env:
   BUILD_TYPE: Release
   MIN_CIBUILDWHEEL_VERSION: 2.16.2
@@ -50,20 +50,26 @@ jobs:
             cibw-arch: macosx_arm64
           }
         - {
-            name: "Ubuntu Latest (x86_64)",
+            name: "Ubuntu Latest (x86_64, manylinux)",
             os: ubuntu-latest,
             cibw-arch: manylinux_x86_64
           }
         - {
-            name: "Ubuntu Latest (ARM64)",
+            name: "Ubuntu Latest (ARM64, manylinux)",
             os: ubuntu-latest,
             cibw-arch: manylinux_aarch64,
             use-qemu: true
           }
         - {
-            name: "Ubuntu Latest (i686)",
+            name: "Ubuntu Latest (x86_64, muslinux)",
             os: ubuntu-latest,
-            cibw-arch: manylinux_i686
+            cibw-arch: muslinux_x86_64
+          }
+        - {
+            name: "Ubuntu Latest (ARM64, muslinux)",
+            os: ubuntu-latest,
+            cibw-arch: muslinux_aarch64,
+            use-qemu: true
           }
         - {
             name: "Windows Latest",


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org