From 6eaef0b1c4e0347311735aac25e1cafc75f1f36a Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Wed, 23 Nov 2022 16:55:54 +0100 Subject: [PATCH 1/8] feat: Build binary distributions for Python 3.10 and 3.11 --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 85199b34..ecfe61bf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,8 @@ jobs: - 3.7 - 3.8 # Included in RMS 12.1, and newer - 3.9 + - "3.10" + - 3.11 os: - ubuntu-20.04 - macos-11 From 6a3567dfb1651f436816362c693effb48380982d Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Wed, 23 Nov 2022 17:52:20 +0100 Subject: [PATCH 2/8] fix: Restrict newest version of setuptools --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df1bfeb8..c40e8a96 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 From 1eac613a318bbb26c9875d1b9f03886026413a4f Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Wed, 23 Nov 2022 18:38:59 +0100 Subject: [PATCH 3/8] debug: Try newer MacOS --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ecfe61bf..34d43565 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - 3.11 os: - ubuntu-20.04 - - macos-11 + - macos-12 steps: - uses: actions/checkout@v2 From be6a1de20c480b90381267e4a6043fba9f4d238d Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Thu, 24 Nov 2022 13:17:41 +0100 Subject: [PATCH 4/8] go back --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 34d43565..ecfe61bf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - 3.11 os: - ubuntu-20.04 - - macos-12 + - macos-11 steps: - uses: actions/checkout@v2 From 40477188b5b6cfe8b7e9492e9e297ad457d4a377 Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Thu, 24 Nov 2022 13:18:27 +0100 Subject: [PATCH 5/8] fix: Use specific XCode --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 5c26147d..220f5317 100644 --- a/setup.py +++ b/setup.py @@ -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 From 67da4ea57fc36ff7d526963efc2027616f73f50c Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Thu, 24 Nov 2022 13:33:29 +0100 Subject: [PATCH 6/8] debug: on --- .github/workflows/ci.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ecfe61bf..828497fa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,14 +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 +# - 3.11 os: - - ubuntu-20.04 +# - ubuntu-20.04 - macos-11 steps: @@ -27,6 +27,9 @@ jobs: with: python-version: ${{ matrix.python }} + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + - name: Build env: NRLIB_LINKING: static From 30230596c9d60305794d99b6304ad0e260a99a12 Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Tue, 16 May 2023 14:40:33 +0200 Subject: [PATCH 7/8] debug: off --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 828497fa..694bc4d5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: with: python-version: ${{ matrix.python }} - - name: Setup upterm session - uses: lhotari/action-upterm@v1 +# - name: Setup upterm session +# uses: lhotari/action-upterm@v1 - name: Build env: From 96142d97fd907ea857734b1624c57a89bf89bc7d Mon Sep 17 00:00:00 2001 From: Sindre Nistad Date: Tue, 16 May 2023 14:58:46 +0200 Subject: [PATCH 8/8] wip: Try to use CLI tools --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 694bc4d5..90a544eb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,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