From b379890187ba46ffa5af294b257a7e33156191f2 Mon Sep 17 00:00:00 2001 From: Tim Paine Date: Fri, 30 Aug 2024 18:16:29 -0400 Subject: [PATCH 1/2] Pin back setuptools until we can remove distutils Signed-off-by: Tim Paine --- conda/dev-environment-unix.yml | 1 + conda/dev-environment-win.yml | 1 + pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conda/dev-environment-unix.yml b/conda/dev-environment-unix.yml index 843c6fdb..bacc1dfe 100644 --- a/conda/dev-environment-unix.yml +++ b/conda/dev-environment-unix.yml @@ -45,6 +45,7 @@ dependencies: - ruamel.yaml - ruff>=0.3,<0.4 - scikit-build + - setuptools>=69,<74 - sqlalchemy - tar - threadpoolctl diff --git a/conda/dev-environment-win.yml b/conda/dev-environment-win.yml index 704f6948..a27d172c 100644 --- a/conda/dev-environment-win.yml +++ b/conda/dev-environment-win.yml @@ -44,6 +44,7 @@ dependencies: - ruamel.yaml - ruff>=0.3,<0.4 - scikit-build + - setuptools>=69,<74 - sqlalchemy - threadpoolctl - tornado diff --git a/pyproject.toml b/pyproject.toml index fb02c2fb..e9178160 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ requires = [ "pyarrow>=7.0.0", "ruamel.yaml", "scikit-build", - "setuptools>=69", + "setuptools>=69,<74", ] build-backend="setuptools.build_meta" From 60187841e43e32f1675858b61143d5025df57286 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 1 Sep 2024 19:06:50 -0400 Subject: [PATCH 2/2] Work around compiler changes Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/conda.yml | 2 +- .github/workflows/wiki-lint.yml | 2 +- cpp/csp/core/Enum.h | 4 ++-- cpp/csp/cppnodes/statsimpl.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fa3d75e..eac56476 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: # github.event.head_commit.message otherwise on pull # requests) initialize: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: COMMIT_MESSAGE: ${{ steps.setup.outputs.COMMIT_MSG }} @@ -130,7 +130,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 @@ -173,7 +173,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md + - ubuntu-24.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md - macos-12 # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md - macos-14 # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md - windows-2019 # https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md @@ -385,7 +385,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 @@ -438,7 +438,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - macos-12 - macos-14 - windows-2019 @@ -592,7 +592,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 @@ -765,7 +765,7 @@ jobs: - test_dependencies if: startsWith(github.ref, 'refs/tags/v') - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Download wheels and sdist diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index c64fdb23..90364730 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - macos-14 - macos-12 - windows-2019 diff --git a/.github/workflows/wiki-lint.yml b/.github/workflows/wiki-lint.yml index 39c0b859..c6226546 100644 --- a/.github/workflows/wiki-lint.yml +++ b/.github/workflows/wiki-lint.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 diff --git a/cpp/csp/core/Enum.h b/cpp/csp/core/Enum.h index d6dac5ee..aac11fd5 100644 --- a/cpp/csp/core/Enum.h +++ b/cpp/csp/core/Enum.h @@ -110,8 +110,8 @@ struct Enum : public EnumTraits iterator( int v ) : m_v( v ) {} Enum operator*() { return Enum( ( EnumV ) m_v ); } - bool operator==(const iterator &rhs) { return m_v == rhs.m_v; } - bool operator!=(const iterator &rhs) { return !(*this == rhs); } + bool operator==(const iterator &rhs) const { return m_v == rhs.m_v; } + bool operator!=(const iterator &rhs) const { return !(*this == rhs); } iterator &operator++() { ++m_v; diff --git a/cpp/csp/cppnodes/statsimpl.h b/cpp/csp/cppnodes/statsimpl.h index 61cda234..dc8b9bf9 100644 --- a/cpp/csp/cppnodes/statsimpl.h +++ b/cpp/csp/cppnodes/statsimpl.h @@ -1357,7 +1357,7 @@ class Rank private: ost> m_mintree; ost> m_maxtree; - double m_lastval; + double m_lastval = std::numeric_limits::quiet_NaN(); int64_t m_method; int64_t m_nanopt;