From c1a088533391c661ef8f217b7f7517f182c87c3d Mon Sep 17 00:00:00 2001 From: ZJaume Date: Wed, 4 Dec 2024 12:55:18 +0000 Subject: [PATCH 1/4] sdist without heliport.data Fixes uploading sdist to PyPi --- .gitignore | 4 ++++ CHANGELOG.md | 4 ++++ Cargo.toml | 2 +- pyproject.toml | 3 +-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1337c57..b763310 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,10 @@ # Wheels wheels* +# Binarized models +heliport-*.data/ +data/ + # Generated by Cargo # will have compiled files and executables debug/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 6564565..11c17a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## v0.8.1 +### Fixed +- `sdist` project layout without `heliport.data` + ## v0.8.0 ### Added - Model creation command. diff --git a/Cargo.toml b/Cargo.toml index 74470ed..49dc2c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "heliport" -version = "0.8.0" +version = "0.8.1" edition = "2021" rust-version = "1.71" diff --git a/pyproject.toml b/pyproject.toml index d9b052c..d2aab7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=1.5,<2.0"] +requires = ["maturin>=1.7.9,<2.0"] build-backend = "maturin" [project] @@ -35,4 +35,3 @@ heliport = "heliport:cli_run" [tool.maturin] features = ["pyo3/extension-module"] data = "heliport.data" -exclude = ["heliport.data/.gitkeep"] From f028d20a83e287717a206ca053e092ea459e4196 Mon Sep 17 00:00:00 2001 From: ZJaume Date: Tue, 7 Jan 2025 10:30:06 +0000 Subject: [PATCH 2/4] Update Maturin to 1.8 Fixes sdist upload to PyPi (does not include package data in sdist) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d2aab7d..aaa9ab4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=1.7.9,<2.0"] +requires = ["maturin>=1.8.0,<2.0"] build-backend = "maturin" [project] From fe52aee00e2ba841884112e9d2427378b4bf84eb Mon Sep 17 00:00:00 2001 From: ZJaume Date: Tue, 7 Jan 2025 10:36:18 +0000 Subject: [PATCH 3/4] [GA] Update Python to 3.12 --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b68aa2d..a8a45f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-python@v5 id: setup-python with: - python-version: 3.9 + python-version: 3.12 - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -56,7 +56,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.x + python-version: 3.12 architecture: ${{ matrix.platform.target }} - name: Build wheels uses: PyO3/maturin-action@v1 @@ -83,7 +83,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.x + python-version: 3.12 - name: Build wheels uses: PyO3/maturin-action@v1 with: From 3c62f19c04a8899989fc859bdc39624b5cf1e54c Mon Sep 17 00:00:00 2001 From: ZJaume Date: Tue, 7 Jan 2025 10:56:58 +0000 Subject: [PATCH 4/4] [GA] Update to MacOS 13 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8a45f6..a8b3e27 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,7 +75,7 @@ jobs: strategy: matrix: platform: - - runner: macos-12 + - runner: macos-13 target: x86_64 - runner: macos-14 target: aarch64