You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2022/07/28 09:57:05 UTC
[arrow-datafusion-python] branch master updated: Upgrade to maturin 0.13.1. (#21)

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

agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion-python.git


The following commit(s) were added to refs/heads/master by this push:
     new b759f01  Upgrade to maturin 0.13.1. (#21)
b759f01 is described below

commit b759f0115aa4d68c43c2c843deff7d8b0bb734ea
Author: Kyle Brooks <84...@users.noreply.github.com>
AuthorDate: Thu Jul 28 05:57:00 2022 -0400

    Upgrade to maturin 0.13.1. (#21)
    
    * Upgrade to maturin docker image 0.13.1.
    
    * Remove deprecated cargo-extra-args.
    
    * Update other files for Maturin 0.13.1.
    
    * Update maturin args in workflows to work with 0.13.1.
    
    * Update test and build status badges for new repo location.
---
 .github/workflows/build.yml |  8 ++++----
 .github/workflows/test.yaml |  2 +-
 README.md                   |  4 ++--
 pyproject.toml              |  2 +-
 requirements-310.txt        | 31 +++++++++++++------------------
 requirements-37.txt         | 31 +++++++++++++------------------
 requirements.txt            | 25 +++++++++++++------------
 7 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d2ca54..ffefa25 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install maturin==0.12.10
+          pip install maturin==0.13.1
 
       - run: rm LICENSE.txt
       - name: Download LICENSE.txt
@@ -71,7 +71,7 @@ jobs:
           path: .
 
       - name: Build Python package
-        run: maturin build --release --strip --cargo-extra-args="--locked"
+        run: maturin build --release --strip --locked
 
       - name: List Windows wheels
         if: matrix.os == 'windows-latest'
@@ -105,8 +105,8 @@ jobs:
           export RUSTFLAGS='-C target-cpu=skylake'
           docker run --rm -v $(pwd):/io \
             --workdir /io \
-            konstin2/maturin:v0.12.10 \
-            build --release --manylinux 2010 --cargo-extra-args="--locked"
+            ghcr.io/pyo3/maturin:v0.13.1 \
+            build --release --manylinux 2010 --locked
       - name: Archive wheels
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4b148f2..a91fbd0 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -102,5 +102,5 @@ jobs:
       - name: Run tests
         run: |
           source venv/bin/activate
-          maturin develop --cargo-extra-args='--locked'
+          maturin develop --locked
           RUST_BACKTRACE=1 pytest -v .
diff --git a/README.md b/README.md
index 04c1b71..704ec16 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@
 
 # DataFusion in Python
 
-[![Python test](https://github.com/datafusion-contrib/datafusion-python/actions/workflows/test.yaml/badge.svg)](https://github.com/datafusion-contrib/datafusion-python/actions/workflows/test.yaml)
-[![Python Release Build](https://github.com/datafusion-contrib/datafusion-python/actions/workflows/build.yml/badge.svg)](https://github.com/datafusion-contrib/datafusion-python/actions/workflows/build.yml)
+[![Python test](https://github.com/apache/arrow-datafusion-python/actions/workflows/test.yaml/badge.svg)](https://github.com/apache/arrow-datafusion-python/actions/workflows/test.yaml)
+[![Python Release Build](https://github.com/apache/arrow-datafusion-python/actions/workflows/build.yml/badge.svg)](https://github.com/apache/arrow-datafusion-python/actions/workflows/build.yml)
 
 This is a Python library that binds to [Apache Arrow](https://arrow.apache.org/) in-memory query engine [DataFusion](https://github.com/apache/arrow-datafusion).
 
diff --git a/pyproject.toml b/pyproject.toml
index ed10cd9..6658a68 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@
 # under the License.
 
 [build-system]
-requires = ["maturin>=0.11,<0.13"]
+requires = ["maturin>=0.11,<0.14"]
 build-backend = "maturin"
 
 [project]
diff --git a/requirements-310.txt b/requirements-310.txt
index 30a2291..0b361ab 100644
--- a/requirements-310.txt
+++ b/requirements-310.txt
@@ -49,24 +49,19 @@ isort==5.10.1 \
     --hash=sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7 \
     --hash=sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951
     # via -r requirements.in
-maturin==0.12.16 \
-    --hash=sha256:29a635699db1f4981b891a4ee51ddcae8c410136ed40103232aea3b5f62e8504 \
-    --hash=sha256:4b5fe1de8b8e7ba5a9f52002b24a2d8148a23d1260c7bd59291c319ccc5b31f1 \
-    --hash=sha256:54ecff17c64cf5c5dc59ff22745517ea56b791995e70008d1dcd1623ce609f78 \
-    --hash=sha256:641c8ed8452cb8a288baf953be78d03e27e60189a64f00cc7bcc1731d158e8f6 \
-    --hash=sha256:70a042197fdcb726c911146a1c875f65f596de122a01eeb58af10faf3bd3a2c5 \
-    --hash=sha256:781abebb255061b5eda0413ecbac22b88a7ab50ecaee607fe5d8e3c55ab48e52 \
-    --hash=sha256:83a8f9378c320e981412f8d367e181af22f145d489a7da0a0c3aea86cf23f048 \
-    --hash=sha256:8aeb62a328bf4d9439758b59ccf5360a5f3127bbe58bedbcb6c64e888de3eb36 \
-    --hash=sha256:8d11e801216f4c91b2ba9da4bad615ffc3638f80a7ba973245a0154dcfdbee64 \
-    --hash=sha256:917f77382cdff55d2f290d0f58b7e6f4a7aaa74b58e2b61e4c67b37786d8a965 \
-    --hash=sha256:97756ad5ff113478de237b029add91def0a40af0dc5e120c25e1595addd9c151 \
-    --hash=sha256:9ce67a844d63d1ba8cdcf903ee2e6e0b21c0b0461b97c8737751d74002ded4c4 \
-    --hash=sha256:a026515e39fd48ee5318de57ddc6841a5fbcd5169b3860fb9ac9ea9521cc6027 \
-    --hash=sha256:bc4da52ef0c7e975396e7e6fb90da8858c518b4dccb810ceabec9db7ecedde57 \
-    --hash=sha256:d63f60dd5dddb165f824b2d8e593dcb31300d832eb6cbc6288dd484e29dfbd89 \
-    --hash=sha256:e5e4e3bfcf209ea1a6d20cade2de1ea716e17ea491a7a8b3fee0e45a10aa1e98 \
-    --hash=sha256:e7e3fa53c5207c05d4148ecbc0ce7463b7757989dadebcd8ab3a61c67b874157
+maturin==0.13.1 \
+    --hash=sha256:3c7890ee95973e474440e41f366aa906a96caa61b8ecfab7e9913beb0d76a73b \
+    --hash=sha256:501ad926d3b6f8b4c8cf2c3513616f72b77a060548dea9d6a7aef1245202e429 \
+    --hash=sha256:7a60f5c1040985ef56b254f2c32f71dbf4ac11db0cc7cf80f0aeca6bd24cf324 \
+    --hash=sha256:89a475f9a9ad1072ce0e0525699787a9c3186c5850ba4e1b23fb2fa10586d1c2 \
+    --hash=sha256:a3aa3be37cff22b4309f1984f07b782d28b39e60dcb381b1b29f938e5fd2ed56 \
+    --hash=sha256:aef6e00e9eb4bdcbd10fda01247f3503354ae9b599b46bd4e55a14ea45b40915 \
+    --hash=sha256:b687d45b43b5292b141a06414cb6ac352f5df5eb74adad9b489d91912ae4eeca \
+    --hash=sha256:b68b15ffc5072b3a24f5c4147cdf391410475e005bd77b874af4b43816bc5afa \
+    --hash=sha256:c1927dbb9d1137e169beb06899a19fe5acd03bcd831d9a2cc008ffcfd854cb6e \
+    --hash=sha256:c36d5762e9d73eef3ca899225d2c8ad8373d9202908cbf598a295def952c98f6 \
+    --hash=sha256:d6086970da37bd8a0d06eb9c31197c25fbb4c82257b9a385786ce54e8b05071d \
+    --hash=sha256:e156b0a358133ad6fd75abc4ddd424c193564b05eb2f6f2ecbccc827c3d4cffe
     # via -r requirements.in
 mccabe==0.6.1 \
     --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \
diff --git a/requirements-37.txt b/requirements-37.txt
index b1776ee..2a4f359 100644
--- a/requirements-37.txt
+++ b/requirements-37.txt
@@ -58,24 +58,19 @@ isort==5.10.1 \
     --hash=sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7 \
     --hash=sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951
     # via -r requirements.in
-maturin==0.12.16 \
-    --hash=sha256:29a635699db1f4981b891a4ee51ddcae8c410136ed40103232aea3b5f62e8504 \
-    --hash=sha256:4b5fe1de8b8e7ba5a9f52002b24a2d8148a23d1260c7bd59291c319ccc5b31f1 \
-    --hash=sha256:54ecff17c64cf5c5dc59ff22745517ea56b791995e70008d1dcd1623ce609f78 \
-    --hash=sha256:641c8ed8452cb8a288baf953be78d03e27e60189a64f00cc7bcc1731d158e8f6 \
-    --hash=sha256:70a042197fdcb726c911146a1c875f65f596de122a01eeb58af10faf3bd3a2c5 \
-    --hash=sha256:781abebb255061b5eda0413ecbac22b88a7ab50ecaee607fe5d8e3c55ab48e52 \
-    --hash=sha256:83a8f9378c320e981412f8d367e181af22f145d489a7da0a0c3aea86cf23f048 \
-    --hash=sha256:8aeb62a328bf4d9439758b59ccf5360a5f3127bbe58bedbcb6c64e888de3eb36 \
-    --hash=sha256:8d11e801216f4c91b2ba9da4bad615ffc3638f80a7ba973245a0154dcfdbee64 \
-    --hash=sha256:917f77382cdff55d2f290d0f58b7e6f4a7aaa74b58e2b61e4c67b37786d8a965 \
-    --hash=sha256:97756ad5ff113478de237b029add91def0a40af0dc5e120c25e1595addd9c151 \
-    --hash=sha256:9ce67a844d63d1ba8cdcf903ee2e6e0b21c0b0461b97c8737751d74002ded4c4 \
-    --hash=sha256:a026515e39fd48ee5318de57ddc6841a5fbcd5169b3860fb9ac9ea9521cc6027 \
-    --hash=sha256:bc4da52ef0c7e975396e7e6fb90da8858c518b4dccb810ceabec9db7ecedde57 \
-    --hash=sha256:d63f60dd5dddb165f824b2d8e593dcb31300d832eb6cbc6288dd484e29dfbd89 \
-    --hash=sha256:e5e4e3bfcf209ea1a6d20cade2de1ea716e17ea491a7a8b3fee0e45a10aa1e98 \
-    --hash=sha256:e7e3fa53c5207c05d4148ecbc0ce7463b7757989dadebcd8ab3a61c67b874157
+maturin==0.13.1 \
+    --hash=sha256:3c7890ee95973e474440e41f366aa906a96caa61b8ecfab7e9913beb0d76a73b \
+    --hash=sha256:501ad926d3b6f8b4c8cf2c3513616f72b77a060548dea9d6a7aef1245202e429 \
+    --hash=sha256:7a60f5c1040985ef56b254f2c32f71dbf4ac11db0cc7cf80f0aeca6bd24cf324 \
+    --hash=sha256:89a475f9a9ad1072ce0e0525699787a9c3186c5850ba4e1b23fb2fa10586d1c2 \
+    --hash=sha256:a3aa3be37cff22b4309f1984f07b782d28b39e60dcb381b1b29f938e5fd2ed56 \
+    --hash=sha256:aef6e00e9eb4bdcbd10fda01247f3503354ae9b599b46bd4e55a14ea45b40915 \
+    --hash=sha256:b687d45b43b5292b141a06414cb6ac352f5df5eb74adad9b489d91912ae4eeca \
+    --hash=sha256:b68b15ffc5072b3a24f5c4147cdf391410475e005bd77b874af4b43816bc5afa \
+    --hash=sha256:c1927dbb9d1137e169beb06899a19fe5acd03bcd831d9a2cc008ffcfd854cb6e \
+    --hash=sha256:c36d5762e9d73eef3ca899225d2c8ad8373d9202908cbf598a295def952c98f6 \
+    --hash=sha256:d6086970da37bd8a0d06eb9c31197c25fbb4c82257b9a385786ce54e8b05071d \
+    --hash=sha256:e156b0a358133ad6fd75abc4ddd424c193564b05eb2f6f2ecbccc827c3d4cffe
     # via -r requirements.in
 mccabe==0.6.1 \
     --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \
diff --git a/requirements.txt b/requirements.txt
index 358578e..0cdaa93 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,18 +28,19 @@ isort==5.9.3 \
     --hash=sha256:9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899 \
     --hash=sha256:e17d6e2b81095c9db0a03a8025a957f334d6ea30b26f9ec70805411e5c7c81f2
     # via -r requirements.in
-maturin==0.11.5 \
-    --hash=sha256:07074778b063a439fdfd5501bd1d1823a216ec5b657d3ecde78fd7f2c4782422 \
-    --hash=sha256:1ce666c386ff9c3c2b5d7d3ca4b1f9f675c38d7540ffbda0d5d5bc7d6ddde49a \
-    --hash=sha256:20f9c30701c9932ed8026ceaf896fc77ecc76cebd6a182668dbc10ed597f8789 \
-    --hash=sha256:3354d030b88c938a33bf407a6c0f79ccdd2cce3e1e3e4a2d0c92dc2e063adc6e \
-    --hash=sha256:4191b0b7362b3025096faf126ff15cb682fbff324ac4a6ca18d55bb16e2b759b \
-    --hash=sha256:70381be1585cb9fa5c02b83af80ae661aaad959e8aa0fddcfe195b004054bd69 \
-    --hash=sha256:7bf96e7586bfdb5b0fadc6d662534b8a41123b33dff084fa383a81ded0ce5334 \
-    --hash=sha256:ab2b3ccf66f5e0f9c3904d215835337b1bd305e79e3bf53b65bbc80a5755e01b \
-    --hash=sha256:b0ac45879a7d624b47d72b093ae3370270894c19779f42aad7568a92951c5d47 \
-    --hash=sha256:c2ded8b4ef9210d627bb966bc67661b7db259535f6062afe1ce5605406b50f3f \
-    --hash=sha256:d78f24561a5e02f7d119b348b26e5772ad5698a43ca49e8facb9ce77cf273714
+maturin==0.13.1 \
+    --hash=sha256:3c7890ee95973e474440e41f366aa906a96caa61b8ecfab7e9913beb0d76a73b \
+    --hash=sha256:501ad926d3b6f8b4c8cf2c3513616f72b77a060548dea9d6a7aef1245202e429 \
+    --hash=sha256:7a60f5c1040985ef56b254f2c32f71dbf4ac11db0cc7cf80f0aeca6bd24cf324 \
+    --hash=sha256:89a475f9a9ad1072ce0e0525699787a9c3186c5850ba4e1b23fb2fa10586d1c2 \
+    --hash=sha256:a3aa3be37cff22b4309f1984f07b782d28b39e60dcb381b1b29f938e5fd2ed56 \
+    --hash=sha256:aef6e00e9eb4bdcbd10fda01247f3503354ae9b599b46bd4e55a14ea45b40915 \
+    --hash=sha256:b687d45b43b5292b141a06414cb6ac352f5df5eb74adad9b489d91912ae4eeca \
+    --hash=sha256:b68b15ffc5072b3a24f5c4147cdf391410475e005bd77b874af4b43816bc5afa \
+    --hash=sha256:c1927dbb9d1137e169beb06899a19fe5acd03bcd831d9a2cc008ffcfd854cb6e \
+    --hash=sha256:c36d5762e9d73eef3ca899225d2c8ad8373d9202908cbf598a295def952c98f6 \
+    --hash=sha256:d6086970da37bd8a0d06eb9c31197c25fbb4c82257b9a385786ce54e8b05071d \
+    --hash=sha256:e156b0a358133ad6fd75abc4ddd424c193564b05eb2f6f2ecbccc827c3d4cffe
     # via -r requirements.in
 mccabe==0.6.1 \
     --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \