From b6f1f0ea6b2c49b5d5bdf7b5d791b483863bca87 Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Tue, 17 Sep 2024 21:06:48 -0400 Subject: [PATCH 1/2] Upgrade CI platforms. --- .github/workflows/test-osx.yml | 11 +++++++---- .github/workflows/test-ubuntu.yml | 2 +- .github/workflows/test-windows.yml | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml index 19928d875b..03b99f8ca7 100644 --- a/.github/workflows/test-osx.yml +++ b/.github/workflows/test-osx.yml @@ -9,14 +9,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6] + python-version: [3.8.10] cxx: [clang++] - std: [c++98, c++11, c++14] # TODO: c++17 is failing ! + std: [c++11, c++14] # TODO: c++17 is failing ! steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: setup prerequisites @@ -28,9 +28,11 @@ jobs: run: | python --version ${{ matrix.cxx }} --version + brew info boost faber -v sed -e "s/\$PYTHON/python/g" .ci/faber > ~/.faber faber \ + --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \ --builddir=build \ cxx.name=${{ matrix.cxx }} \ cxxflags=-std=${{ matrix.std }} \ @@ -38,6 +40,7 @@ jobs: - name: test run: | faber \ + --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \ --builddir=build\ cxx.name=${{ matrix.cxx }} \ cxxflags=-std=${{ matrix.std }} \ diff --git a/.github/workflows/test-ubuntu.yml b/.github/workflows/test-ubuntu.yml index dab98aee4a..9910232e82 100644 --- a/.github/workflows/test-ubuntu.yml +++ b/.github/workflows/test-ubuntu.yml @@ -26,7 +26,7 @@ jobs: image: ${{ matrix.docker-img }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: build run: | diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 36c4a8e4f0..e7b02927b2 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -11,8 +11,8 @@ jobs: python-version: [3.7] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - uses: microsoft/setup-msbuild@v1.1 From 9f6fea89ef9069a4b22417f4bd6578ace27d7bdb Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Tue, 17 Sep 2024 20:40:19 -0400 Subject: [PATCH 2/2] Use the expected return type. --- src/object/class.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object/class.cpp b/src/object/class.cpp index 5b5095151d..1a198408a3 100644 --- a/src/object/class.cpp +++ b/src/object/class.cpp @@ -502,7 +502,7 @@ namespace objects ); } - str qualname(const char *name) + object qualname(const char *name) { #if PY_VERSION_HEX >= 0x03030000 if (PyObject_HasAttrString(scope().ptr(), "__qualname__")) {