From cdbc19a9c10bf1a940c40f457f30832b9132f459 Mon Sep 17 00:00:00 2001 From: Michael O'Keefe Date: Fri, 20 Sep 2024 14:36:31 -0600 Subject: [PATCH 1/3] v2.1.3 --- pyproject.toml | 2 +- rust/fastsim-core/Cargo.toml | 2 +- rust/fastsim-core/fastsim-proc-macros/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 81260ac9..e1696c98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "fastsim" -version = "2.1.2" +version = "2.1.3" authors = [{ name = "NREL/MTES/CIMS/MBAP Group", email = "fastsim@nrel.gov" }] description = "Tool for modeling vehicle powertrains" readme = "README.md" diff --git a/rust/fastsim-core/Cargo.toml b/rust/fastsim-core/Cargo.toml index bd90b226..b8639323 100644 --- a/rust/fastsim-core/Cargo.toml +++ b/rust/fastsim-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastsim-core" -version = "0.1.6" +version = "0.1.7" edition = "2021" license = "Apache-2.0" authors = ["NREL/MTES/CIMS/MBAP Group "] diff --git a/rust/fastsim-core/fastsim-proc-macros/Cargo.toml b/rust/fastsim-core/fastsim-proc-macros/Cargo.toml index 7956e0ed..085fd1b8 100644 --- a/rust/fastsim-core/fastsim-proc-macros/Cargo.toml +++ b/rust/fastsim-core/fastsim-proc-macros/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["NREL/MTES/CIMS/MBAP Group "] name = "fastsim-proc-macros" -version = "0.1.6" +version = "0.1.7" edition = "2021" license = "Apache-2.0" readme = "../../../README.md" From 6211b6cff200b13c41e3bfbdc6ac847f91efd05e Mon Sep 17 00:00:00 2001 From: Michael O'Keefe Date: Tue, 1 Oct 2024 12:12:43 -0600 Subject: [PATCH 2/3] Fix CI issue with building universal wheels on Apple Silicon --- .github/workflows/release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3c9f6c3c..775412ab 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -87,7 +87,8 @@ jobs: pip install -U setuptools-rust && curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=nightly --profile=minimal -y && rustup show - + CIBW_BEFORE_BUILD_MACOS: > + rustup target add x86_64-apple-darwin # - name: build windows 32bit binaries # if: matrix.os == 'windows' # run: cibuildwheel --output-dir dist From e574032fd34c967f2bbb20fe60ffcc8f3d217800 Mon Sep 17 00:00:00 2001 From: Michael O'Keefe Date: Tue, 1 Oct 2024 15:32:34 -0600 Subject: [PATCH 3/3] Fix wheels build. Add line to set up Intel build to make universal python wheels when building on M1 (Apple Silicon) macs. --- .github/workflows/wheels.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml index 5640579b..bbc27ea9 100644 --- a/.github/workflows/wheels.yaml +++ b/.github/workflows/wheels.yaml @@ -89,7 +89,8 @@ jobs: pip install -U setuptools-rust && curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=nightly --profile=minimal -y && rustup show - + CIBW_BEFORE_BUILD_MACOS: > + rustup target add x86_64-apple-darwin # - name: build windows 32bit binaries # if: matrix.os == 'windows' # run: cibuildwheel --output-dir dist