diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fb2762..3dda3b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,6 +49,8 @@ jobs: uses: jrl-umi3218/github-actions/build-cmake-project@master with: build-type: ${{ matrix.build-type }} + env: + ARCHFLAGS: "-arch arm64" - name: Slack Notification if: failure() uses: archive/github-actions-slack@master diff --git a/setup.in.py b/setup.in.py index 33abc7f..141a6a7 100644 --- a/setup.in.py +++ b/setup.in.py @@ -4,13 +4,6 @@ from __future__ import print_function -import pkg_resources -requirements_file = "@CMAKE_CURRENT_SOURCE_DIR@/requirements.txt" -with open(requirements_file) as fd: - for pkg in fd: - pkg = pkg.strip() - pkg_resources.require(pkg) - try: from setuptools import setup from setuptools import Extension @@ -46,6 +39,12 @@ def GenExtension(name): compile_args = ['-std=c++11'] if win32_build: compile_args = ['-DWIN32'] + elif sys.platform == 'darwin': + from platform import machine + osx_arch = machine() + os.environ["ARCHFLAGS"] = "-arch " + osx_arch + compile_args += ["-arch", osx_arch] + return Extension(name, [ext_src], extra_compile_args = compile_args, include_dirs = include_dirs) extensions = [ @@ -64,10 +63,17 @@ def GenExtension(name): extensions = cythonize(extensions, cache = True) +dependencies = [ + "Cython>=0.2", + "coverage", + "numpy>=1.8.2", + "pytest" +] + setup( name = 'eigen', version='@PROJECT_VERSION@', ext_modules = extensions, - packages = packages, - package_data = { 'eigen': data } + package_data = { 'eigen': data }, + install_requires=dependencies )