Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PyPI doesn't have Apple M1 version #7

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ jobs:
strategy:
matrix:
python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
os: [ubuntu-latest, macos-13, macos-14, windows-latest]
exclude:
- os: ubuntu-latest
python-version: '3.12'
- os: macos-13
python-version: '3.7'
- os: macos-14
python-version: '3.7'
- os: macos-14
python-version: '3.8'

steps:
- uses: actions/checkout@v2
Expand All @@ -39,10 +43,6 @@ jobs:
run: |
sudo apt-get update -qq -y
sudo apt-get install -qq -y libglu1-mesa build-essential libeigen3-dev
- name: Install Brew On Mac OS
if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
run: |
brew install eigen
- name: Install dependencies
run: |
python3 -m pip install --upgrade pip
Expand All @@ -51,7 +51,7 @@ jobs:

- name: Build
run: |
python3 setup.py bdist_wheel
pip wheel . --no-deps --wheel-dir dist

- name: Publish (Windows)
env:
Expand All @@ -65,7 +65,7 @@ jobs:
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
run: |
python3 -m twine upload dist/*

Expand Down
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ else(WIN32)
#target_link_libraries(Clipper2 PUBLIC -lm)

# Find Required packages
find_package(Eigen3 3.3 REQUIRED)
find_package(Eigen3 3.3)
if (NOT EIGEN3_FOUND)
message(WARNING "Eigen3 not found, will build with the included version.")
set(EIGEN3_INCLUDE_DIR external/eigen)
endif(NOT EIGEN3_FOUND)


endif(WIN32)

Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build-system]
requires = ["setuptools", "cmake"]