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

Build binary distributions for Python 3.10 and 3.11 #11

Closed
wants to merge 8 commits into from
Closed
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
16 changes: 11 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ jobs:
strategy:
matrix:
python:
- 3.6 # Included in RMS 11 - 12.0
- 3.7
- 3.8 # Included in RMS 12.1, and newer
- 3.9
# - 3.6 # Included in RMS 11 - 12.0
# - 3.7
# - 3.8 # Included in RMS 12.1, and newer
# - 3.9
- "3.10"
# - 3.11
os:
- ubuntu-20.04
# - ubuntu-20.04
- macos-11

steps:
Expand All @@ -25,6 +27,9 @@ jobs:
with:
python-version: ${{ matrix.python }}

# - name: Setup upterm session
# uses: lhotari/action-upterm@v1

- name: Build
env:
NRLIB_LINKING: static
Expand All @@ -34,6 +39,7 @@ jobs:
if [[ $RUNNER_OS == "Linux" ]]; then
docker-compose run build-linux
else
sudo xcode-select -s /Library/Developer/CommandLineTools
make build
fi

Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ define PYPROJECT_TOML
[build-system]
requires = [
"setuptools>=42",
# There seems to be an issue with newer versions of setuptools
# See https://github.com/pypa/packaging-problems/issues/604 for details
"setuptools<61.0",
"wheel",
# We use the oldest compatible version, to make life easier with Emerson RMS
# If we use a newer version, the compilation of Boost.Python, will cause the module to crach
Expand Down Expand Up @@ -91,7 +94,7 @@ password = $(PYPI_TEST_API_TOKEN)
endef
export PYPIRC

.PHONY: all tests clean build
.PHONY: all tests clean build pyproject.toml


install: build-boost-python
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,9 @@ def is_compiling() -> bool:
linker_args += ['-I' + mkl_root + '/include', '-L' + library_dir]
linker_args += mkl_libraries
linker_args += ' -lpthread -lm -ldl'.format(mkl_root, library_dir).split()
compile_args += [
'-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk',
]
else:
linker_args += ['-Wl,--start-group']
linker_args += mkl_libraries
Expand Down