Skip to content

Commit

Permalink
Merge pull request #351 from Creelman/master
Browse files Browse the repository at this point in the history
Add ARM MacOS support for Python Bindings
  • Loading branch information
alphaville authored Jul 25, 2024
2 parents d9c6dde + 7c2adb0 commit 770c905
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 11 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: test
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.12'
architecture: 'x64'
- run: cargo test --features rp
- run: cargo test --features jem
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-11]
os: [macos-latest]
env:
DO_DOCKER: 0
steps:
Expand All @@ -50,10 +50,9 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: test
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.8'
architecture: 'x64'
python-version: '3.12'
- run: cargo test --features rp
- run: cargo test --features jem
- run: bash ./ci/script.sh
4 changes: 2 additions & 2 deletions .github/workflows/dox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
- uses: actions/checkout@v2

# Install sphinx
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.12'
- name: Build and deploy docs
run: bash ci/sphinx-documentation.sh

2 changes: 1 addition & 1 deletion ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ regular_test() {
pip install virtualenv

# --- create virtualenv
virtualenv -p python3.8 venv
virtualenv -p python3.12 venv

# --- activate venv
source venv/bin/activate
Expand Down
8 changes: 8 additions & 0 deletions open-codegen/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

Note: This is the Changelog file of `opengen` - the Python interface of OpEn

## [0.8.1] - 2024-07-17

### Added

* Python direct interface support for ARM-based Macs
* Updated GitHub Actions to use the macos-latest runner
* Updated GitHub Actions to use Python3.12 (required for above)

## [0.8.0] - 2024-03-20

### Added
Expand Down
2 changes: 1 addition & 1 deletion open-codegen/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0
0.8.1
5 changes: 5 additions & 0 deletions open-codegen/opengen/templates/python/cargo_config
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ rustflags = [
"-C", "link-arg=-undefined",
"-C", "link-arg=dynamic_lookup",
]
[target.aarch64-apple-darwin]
rustflags = [
"-C", "link-arg=-undefined",
"-C", "link-arg=dynamic_lookup",
]
2 changes: 1 addition & 1 deletion open-codegen/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
exclude=["icasadi", "templates"]),
include_package_data=True,
install_requires=[
'jinja2', 'casadi', 'pyyaml', 'retry', 'numpy'
'jinja2', 'casadi', 'pyyaml', 'retry', 'numpy', 'setuptools'
],
classifiers=[
'Development Status :: 4 - Beta',
Expand Down

0 comments on commit 770c905

Please sign in to comment.