diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1e64c3d..b928c20 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v3 diff --git a/pyproject.toml b/pyproject.toml index 3a710af..d54bdac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,11 +34,11 @@ filterwarnings = [ ] testpaths = ["tests"] -[tool.cibuildwheel.linux] +[tool.cibuildwheel] # Setuptools bug causes collision between pypy and cpython artifacts before-all = [ "rm -rf '{project}/build'", - 'pip3 install "conan==2.*.*"', + 'pip3 install "conan>=2"', "conan profile detect --force", "cd '{project}/devel/cibw/linux' && ./cibw_setup_deps.sh" ] @@ -49,23 +49,12 @@ environment-pass = ["CMAKE_ARGS"] # Setuptools bug causes collision between pypy and cpython artifacts before-all = [ "rm -rf '{project}/build'", - 'pip3 install "conan==2.*.*"', + 'pip3 install "conan>=2"', "sudo conan profile detect --force", "cd '{project}/devel/cibw/macos' && sudo ./cibw_setup_deps.sh" ] environment = { CMAKE_ARGS = '-DCMAKE_PREFIX_PATH=/usr/local/share', MACOSX_DEPLOYMENT_TARGET = '10.15' } -[tool.cibuildwheel.windows] -# Setuptools bug causes collision between pypy and cpython artifacts -before-all = [ - "rm -rf '{project}/build'", - 'pip3 install "conan==2.*.*"', - "conan profile detect --force", - "cd '{project}\\devel\\cibw\\linux' && ./cibw_setup_deps.sh" -] -environment = { CMAKE_ARGS = '-DCMAKE_PREFIX_PATH=/usr/local/share', MACOSX_DEPLOYMENT_TARGET = '10.15' } - - [tool.ruff] extend-select = [