Skip to content

Commit 1ce6f25

Browse files
authored
Merge pull request Point72#359 from Point72/tkp/setuptools
Pin back setuptools until we can remove distutils
2 parents f33065d + 6018784 commit 1ce6f25

File tree

8 files changed

+15
-13
lines changed

8 files changed

+15
-13
lines changed

.github/workflows/build.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# github.event.head_commit.message otherwise on pull
5757
# requests)
5858
initialize:
59-
runs-on: ubuntu-22.04
59+
runs-on: ubuntu-24.04
6060

6161
outputs:
6262
COMMIT_MESSAGE: ${{ steps.setup.outputs.COMMIT_MSG }}
@@ -130,7 +130,7 @@ jobs:
130130
strategy:
131131
matrix:
132132
os:
133-
- ubuntu-22.04
133+
- ubuntu-24.04
134134
python-version:
135135
- 3.9
136136

@@ -173,7 +173,7 @@ jobs:
173173
strategy:
174174
matrix:
175175
os:
176-
- ubuntu-22.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md
176+
- ubuntu-24.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
177177
- macos-12 # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
178178
- macos-14 # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
179179
- windows-2019 # https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md
@@ -385,7 +385,7 @@ jobs:
385385
strategy:
386386
matrix:
387387
os:
388-
- ubuntu-22.04
388+
- ubuntu-24.04
389389
python-version:
390390
- 3.9
391391

@@ -438,7 +438,7 @@ jobs:
438438
strategy:
439439
matrix:
440440
os:
441-
- ubuntu-22.04
441+
- ubuntu-24.04
442442
- macos-12
443443
- macos-14
444444
- windows-2019
@@ -592,7 +592,7 @@ jobs:
592592
strategy:
593593
matrix:
594594
os:
595-
- ubuntu-22.04
595+
- ubuntu-24.04
596596
python-version:
597597
- 3.9
598598

@@ -765,7 +765,7 @@ jobs:
765765
- test_dependencies
766766

767767
if: startsWith(github.ref, 'refs/tags/v')
768-
runs-on: ubuntu-22.04
768+
runs-on: ubuntu-24.04
769769

770770
steps:
771771
- name: Download wheels and sdist

.github/workflows/conda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
matrix:
3434
os:
35-
- ubuntu-22.04
35+
- ubuntu-24.04
3636
- macos-14
3737
- macos-12
3838
- windows-2019

.github/workflows/wiki-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
os:
25-
- ubuntu-22.04
25+
- ubuntu-24.04
2626
python-version:
2727
- 3.9
2828

conda/dev-environment-unix.yml

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ dependencies:
4545
- ruamel.yaml
4646
- ruff>=0.3,<0.4
4747
- scikit-build
48+
- setuptools>=69,<74
4849
- sqlalchemy
4950
- tar
5051
- threadpoolctl

conda/dev-environment-win.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dependencies:
4444
- ruamel.yaml
4545
- ruff>=0.3,<0.4
4646
- scikit-build
47+
- setuptools>=69,<74
4748
- sqlalchemy
4849
- threadpoolctl
4950
- tornado

cpp/csp/core/Enum.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ struct Enum : public EnumTraits
110110
iterator( int v ) : m_v( v ) {}
111111

112112
Enum operator*() { return Enum( ( EnumV ) m_v ); }
113-
bool operator==(const iterator &rhs) { return m_v == rhs.m_v; }
114-
bool operator!=(const iterator &rhs) { return !(*this == rhs); }
113+
bool operator==(const iterator &rhs) const { return m_v == rhs.m_v; }
114+
bool operator!=(const iterator &rhs) const { return !(*this == rhs); }
115115

116116
iterator &operator++() {
117117
++m_v;

cpp/csp/cppnodes/statsimpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ class Rank
13571357
private:
13581358
ost<std::less<double>> m_mintree;
13591359
ost<std::greater<double>> m_maxtree;
1360-
double m_lastval;
1360+
double m_lastval = std::numeric_limits<double>::quiet_NaN();
13611361

13621362
int64_t m_method;
13631363
int64_t m_nanopt;

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ requires = [
66
"pyarrow>=7.0.0",
77
"ruamel.yaml",
88
"scikit-build",
9-
"setuptools>=69",
9+
"setuptools>=69,<74",
1010
]
1111
build-backend="setuptools.build_meta"
1212

0 commit comments

Comments
 (0)