From 77f02e15ba22a003aedff7510cb2f718f7725811 Mon Sep 17 00:00:00 2001 From: Graham Knapp <32717635+dancergraham@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:40:53 +0100 Subject: [PATCH 01/10] Test for Python 3.13 --- .github/workflows/CI.yml | Bin 13706 -> 6855 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 775082cd9f6a54031dd13359fbd10976b6f07a2e..05cc41b79f0e6ed65b2add5fa20406228b8a047b 100644 GIT binary patch literal 6855 zcmeHMZExE)5dLn!|KZvW^;U%T61Qm~pg_7|7=mG~(Ips$VK8Wkwph!QMpAZ+roU_- z_LKG(b|;FG{1U@Smt-5_54OdZ+rg(#PCsMGj+14z88^Oq#GRKj8%?xHCntb>lq;Jv98_4( z*}#2Ut|!6s3v#&bE>VeHpNuVhVU?0`$z>A3A{HVsz7NV32g`T; zUI|y`G(4Ff)}uBS^tRsSa@SY6+_?dLgPUhei$riE@E`6S5PlZ_j-`s2M6l^hiwetb zq6tHewhEwQbuJ1xd&kbWS~?&Wr_`(KH+-HYDZgsR-VJ#%h;eP@7~2}&0NB{IGo&*i zD^_NE8vu`4926T~*V9J=zb!d-N6DZet@#;!{pI?pawa~2j>CHAs}*aTSR_dRBW_~9 z7SI6-;Ie)OKzIQY%@zlvKCl_gg_=W`zMBI~n(I)w_TEUU9+`2DXR$dblNm^b+9wH! z7caek(Oy$ic|1iq2!?XpRnyl^gW;hJo6cC?)vK)l-h_|#v>_Vs>C=taRRa0ZYv^QI zc>KJxVr6$$bIs)}?V)us1R{*WxH>;a^{zIML<6@6%&n(~&WTQa^gBB0eq99(GK5Pi zXX#XwQP?$fEw!vDjizy)S;GPV&n(06S!S|Yb&~JT($OXrnzgxXkSHAOuCQo%acqhG2ARZ|Cs9tgquo)gaPGc^NU>Q-{HMtPI?aae$R#OORSjF%!W*RCCVy5es-bDHily=P?_ zq)bUvXfZ}I3%^Z|80;QqrOV5b*60dkq3n>>g4amJY;e~#Eu(~pkY)U}xWgaR*ZBja z@`|bw+bH%PIJ^JmR9>gO$*)h~97#%>f{_yiHWq&8=pe@wRvfB~Si!Rdu+UgYd50Ae zA`;;!#;XO?H2W0-{QHAyZQz#ZZ%$0IU$4=GCTK|74S1}z715;I7*LP7@5|R8JJZA{W?D0MbdtA@i?-b*0Y=w0H@y*%!`_s3>!7qc;;n}+%zI$8pwjx9p+jNWeH@3M1Dl;Z7Fz!h;DVcqS#%j0z21wAFsQ>@~ literal 13706 zcmeI3eQz5@5XSd!B))^&q8bp6NlOc=ghZ(jLI@g_MhGDkIf>ht#E$VfO%Ua)1J7^A z+uPfFu~R!PX|0p(yS?4n+1Z(AXJ^O%{&UN<+*5bt1}@XxGyR^pzV7U~=g!>Jox0~L z8|gD~Jw5l`p=#{AKlMHIC1-jwP>q&*;kMnD`&^&T-23i5XY^0?=FE-N&f0&X=ZQ*2 zvpS(>OXX#nY406(px#>IY9MZoL}y=59bIGb1b>;njV9kC^*U7P1J!!uzVmM=Kh>KD z{)t}4qLYbQUP9@*<<-ofEi-<=uv zx$Xrn(qHC%;w@_GC41q%aQ8J|_h%N9)?Y{Ov0UT+uWr;mF9q~69kfODr3bQuQ`MWguY^a2LxDn&W)l_YGpA$Csv*je*IlUHE9hXLdM+M7 zqI&&_>2yQ~GzhlGNbXACx80o*bw(WH*Vp0;j0S1uhgGsDbJ+BeA0@%E_X6QFnD{8W?ja1h0 zzlOzQ-@c5?agUia>cC3~^k<&hnrCpJAE9&Hf_rdhBzeb(2=}&@rnZ*O@UBOtQ`Nuh z9H-WR2D2JKiFuxg_km<#^{Q z0o|FF4Mf9yzB)={)gOxntxWbvq9wZb-H zs*_rEQ(b7KT6kk73v6~3dT1JW+uc@Qv0qf>cg4EgayQ(UYSY$e$C56qbz9GMx*V@L z=m&oBP#Dym>8^Q!hDNOZ+~sRHm{eW^k&7)U}cVWRT{8mp7k-t zMX;56i{LBu>UmoavKbG>{cw=wP&1$T6$iO(_H5{CkPUK6uNV=rvUqK;YsU(3l{?1u z_q*A%ZT4&ynThS8d4;;(d$ux8?rDF#SK*_i{@(T8#g)f>U3YU=<44zditmc|+mr8r ze?x3`PxrRNYg$EP|MpFLz{gsdiHQ(j!85!okM)H{!(Qu5Z-^;1?R{78DdMGBj4|Gg zmpO`e+I8zczDp)wdo{ars0A-N^|2T6s+-!sc|Vw4CA$$$OyUy|xVBk-8_z9@qh99Z zB8}Z6w{TVYzpLw+*jj7>U{7C~n$9BJz)6hEal|20WP+$cU*B)fsX>^75ECJa$q2zW zqULerVfh$I>icZYDE_}^6zN=DZ$CA~lMusSUZ;Zvt>eUDbv|lwhyE^|I{YMb<8+4j zCYT;D{@po!2&*BwPpmav3Ey6SCLeL9@(exLGQV-;Vwp%@vCndjK~tYaD-H8Ti;Wi( z%Pn22Hh#s%udtK(tIlGGt^0cT6pO?p7CE^pp24wq8VZ*}HozkBhtf#RTi5t}Q zzDU#~trIXlQ>=lkOfvsM8HiV2o8$B4`W^au){8jXC&u7>H1Svhg2y}Voh#2i3#ZFu zULE@VZ8LXpnVwCgxnt?5()FmgcWUl0mPYVRE$_CgJ^A|cw3@j^I(0jrAeCbFT~VK7 zjd`MYL!PAw*t1z z%k~cTdP_8RMTLAW@=u^RkaWoECpt}ean8+x;+(>A9_m1&?09;4&da&qsS%NiwE;eI z9*E5w7qNA`4hL1)?3d#p{r^FE+>}gpS@t*gmQ|mQuez3LK{ZdyAiTx3N7Am#<$$I* z_pQcdS@?F&^ZMgwj+>A$mQTlL*ITYLxjW==2(JlNNBUnr-ryWldTPA-q=r3#E&g@?&p=J0DNOn^#R)b+TOE#6t zeA%_w&c=#(AI8J)5ALD->5W>KZ7{LZpcW>lt-7> ze^_c)pKAa*+We(97kDds2r;tMwMu;i^4ms2H1HaGC&SV57tu}2fy;D~KqQI`+zYP_ Q;K4{(TFluGnnmCL0eab*IRF3v From c98984f3160de4f787d8472fe925e00f0a6b3ffe Mon Sep 17 00:00:00 2001 From: dancergraham Date: Fri, 15 Nov 2024 21:07:13 +0100 Subject: [PATCH 02/10] fix: try ignoring pyo3 compatibility warnings --- .github/workflows/CI.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 05cc41b..380debb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -37,6 +37,8 @@ jobs: python-version: 3.13 - name: Build wheels uses: PyO3/maturin-action@v1 + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 with: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter @@ -135,6 +137,8 @@ jobs: architecture: ${{ matrix.platform.target }} - name: Build wheels uses: PyO3/maturin-action@v1 + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 with: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter @@ -171,6 +175,8 @@ jobs: python-version: 3.13 - name: Build wheels uses: PyO3/maturin-action@v1 + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 with: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter From 0a17ab51d7d6fc0dbb8fef9ab1f942cb1ceecc61 Mon Sep 17 00:00:00 2001 From: dancergraham Date: Fri, 15 Nov 2024 21:13:57 +0100 Subject: [PATCH 03/10] fix: try ignoring pyo3 compatibility warnings to allow building on Python 3.13 with pyo3 v0.21 --- .github/workflows/CI.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 380debb..6529e36 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -66,6 +66,8 @@ jobs: arch: ${{ matrix.platform.target }} distro: ubuntu22.04 githubToken: ${{ github.token }} + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 install: | apt-get update apt-get install -y --no-install-recommends python3 python3-pip @@ -151,6 +153,8 @@ jobs: - name: pytest if: ${{ !startsWith(matrix.platform.target, 'aarch64') }} shell: bash + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 run: | set -e python3 -m venv .venv @@ -187,6 +191,8 @@ jobs: name: wheels-macos-${{ matrix.platform.target }} path: dist - name: pytest + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 run: | set -e python3 -m venv .venv From 84ae313ab5d9bdbea31fd1dc181cc73de9afa83e Mon Sep 17 00:00:00 2001 From: dancergraham Date: Fri, 15 Nov 2024 21:16:40 +0100 Subject: [PATCH 04/10] fix: try ignoring pyo3 compatibility warnings to allow building on Python 3.13 with pyo3 v0.21 --- .github/workflows/CI.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6529e36..687fd56 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -153,8 +153,6 @@ jobs: - name: pytest if: ${{ !startsWith(matrix.platform.target, 'aarch64') }} shell: bash - env: - PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 run: | set -e python3 -m venv .venv From 5d80251f513e7406eb211c500978ce04dce478f6 Mon Sep 17 00:00:00 2001 From: dancergraham Date: Fri, 15 Nov 2024 22:09:09 +0100 Subject: [PATCH 05/10] docs: update metadata --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7cf2807..040f024 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,8 +12,8 @@ description = "Read e57 files to Python. E57 is a compact, non-proprietary point authors = [ { name = "Graham Knapp", email = "graham.knapp@gmail.com" } ] -requires-python = ">=3.7" -keywords = ["pointcloud"] +requires-python = ">=3.8" +keywords = ["pointcloud", "e57", "lidar"] classifiers = [ "Programming Language :: Rust", "Programming Language :: Python :: Implementation :: CPython", From 1a9bbacb605475211fe8e2044e0be0c2ee9f4d7d Mon Sep 17 00:00:00 2001 From: dancergraham Date: Fri, 15 Nov 2024 22:11:49 +0100 Subject: [PATCH 06/10] fix: try to fix ci syntax --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 687fd56..a9a2f1c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -62,12 +62,12 @@ jobs: - name: pytest if: ${{ !startsWith(matrix.platform.target, 'x86') && matrix.platform.target != 'ppc64' }} uses: uraimo/run-on-arch-action@v2 + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 with: arch: ${{ matrix.platform.target }} distro: ubuntu22.04 githubToken: ${{ github.token }} - env: - PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 install: | apt-get update apt-get install -y --no-install-recommends python3 python3-pip From 657f943dea317cf76adb677e6f0d71214bb85ab3 Mon Sep 17 00:00:00 2001 From: dancergraham Date: Fri, 15 Nov 2024 22:26:22 +0100 Subject: [PATCH 07/10] fix: try to fix ci syntax --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a9a2f1c..3140038 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,6 +51,8 @@ jobs: path: dist - name: pytest if: ${{ startsWith(matrix.platform.target, 'x86_64') }} + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 shell: bash run: | set -e From 438563322c7f0d664132f36fa708cccd9cfb3e0d Mon Sep 17 00:00:00 2001 From: Graham Knapp <32717635+dancergraham@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:30:51 +0100 Subject: [PATCH 08/10] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 040f024..cc8a7f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ dependencies = [ 'pytest', 'numpy', ] -description = "Read e57 files to Python. E57 is a compact, non-proprietary point cloud format that's defined by the ASTM E2807 standard. This format is widely adopted by 3D design applications." +description = "Read e57 files to Python. E57 is a compact, non-proprietary point cloud format that's defined by the ASTM E2807 standard. This format is widely adopted by 3D design applications." authors = [ { name = "Graham Knapp", email = "graham.knapp@gmail.com" } ] From c400ee27031c80a8d99d3bd2f7926e9b3eb77eb2 Mon Sep 17 00:00:00 2001 From: Graham Knapp <32717635+dancergraham@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:39:39 +0100 Subject: [PATCH 09/10] Update CI.yml --- .github/workflows/CI.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3140038..2fee7b4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -97,6 +97,8 @@ jobs: python-version: 3.13 - name: Build wheels uses: PyO3/maturin-action@v1 + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 with: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter @@ -110,6 +112,8 @@ jobs: - name: pytest if: ${{ !startsWith(matrix.platform.target, 'x86') }} uses: uraimo/run-on-arch-action@v2 + env: + PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1 with: arch: ${{ matrix.platform.target }} distro: alpine_latest From 90b485a00fc31e295b9894852436a110c7dcba9b Mon Sep 17 00:00:00 2001 From: Graham Knapp <32717635+dancergraham@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:49:53 +0100 Subject: [PATCH 10/10] Update CI.yml macos-12 is deprecated and has been removed --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2fee7b4..d1af651 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -172,7 +172,7 @@ jobs: strategy: matrix: platform: - - runner: macos-12 + - runner: macos-13 target: x86_64 - runner: macos-14 target: aarch64