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.

Sign up for GitHub

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

Jump to bottom

Pin back setuptools until we can remove distutils #359

Merged
merged 2 commits into from
Sep 10, 2024
Merged

Pin back setuptools until we can remove distutils #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b379890
Pin back setuptools until we can remove distutils
timkpaine Aug 30, 2024
6018784
Work around compiler changes
timkpaine Sep 1, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
python-version:
- 3.9

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -385,7 +385,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
python-version:
- 3.9

Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
- macos-12
- macos-14
- windows-2019
Expand Down Expand Up @@ -592,7 +592,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
python-version:
- 3.9

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
- macos-14
- macos-12
- windows-2019
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wiki-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
python-version:
- 3.9

Expand Down
1 change: 1 addition & 0 deletions conda/dev-environment-unix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dependencies:
- ruamel.yaml
- ruff>=0.3,<0.4
- scikit-build
- setuptools>=69,<74
- sqlalchemy
- tar
- threadpoolctl
Expand Down
1 change: 1 addition & 0 deletions conda/dev-environment-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ dependencies:
- ruamel.yaml
- ruff>=0.3,<0.4
- scikit-build
- setuptools>=69,<74
- sqlalchemy
- threadpoolctl
- tornado
Expand Down
4 changes: 2 additions & 2 deletions cpp/csp/core/Enum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cpp/csp/cppnodes/statsimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ class Rank
private:
ost<std::less<double>> m_mintree;
ost<std::greater<double>> m_maxtree;
double m_lastval;
double m_lastval = std::numeric_limits<double>::quiet_NaN();
AdamGlustein marked this conversation as resolved.
Show resolved Hide resolved

int64_t m_method;
int64_t m_nanopt;
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ requires = [
"pyarrow>=7.0.0",
"ruamel.yaml",
"scikit-build",
"setuptools>=69",
"setuptools>=69,<74",
]
build-backend="setuptools.build_meta"

Expand Down
Loading