Skip to content

Commit b2bb5e2

Browse files
committed
clean up
1 parent 673cd30 commit b2bb5e2

File tree

4 files changed

+6
-21
lines changed

4 files changed

+6
-21
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
# Needed on Windows CI to compile with Visual Studio compiler
2929
# otherwise Meson detects a MINGW64 platform and use MINGW64
3030
# toolchain
31-
pixi reinstall -e dev --frozen fastcan -- -Csetup-args="--vsenv"
32-
pixi reinstall -e nogil --frozen fastcan -- -Csetup-args="--vsenv"
31+
pixi reinstall -e dev --frozen fastcan
32+
pixi reinstall -e nogil --frozen fastcan
3333
3434
- name: Test with pytest
3535
run: |
@@ -39,13 +39,6 @@ jobs:
3939
run: |
4040
pixi run -e dev doc
4141
CMD=doctest pixi run -e dev doc
42-
- name: Debug List compiled fastcan extension in build
43-
if: runner.os == 'Windows'
44-
shell: bash
45-
run: |
46-
echo "Listing build/cp313t/fastcan directory:"
47-
ls build/cp313t/fastcan || true
48-
ls build/cp313/fastcan || true
4942
- name: Test nogil
5043
run: |
5144
pixi run -e nogil nogil-eta

.github/workflows/wheel.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ jobs:
4141
CIBW_ARCHS_LINUX: auto64
4242
CIBW_ARCHS_MACOS: x86_64 arm64
4343
CIBW_ARCHS_WINDOWS: auto64
44-
CIBW_BEFORE_ALL_LINUX: yum install -y ninja-build python3-devel
45-
# Needed on Windows CI to compile with Visual Studio compiler
46-
# otherwise Meson detects a MINGW64 platform and use MINGW64
47-
# toolchain
48-
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--vsenv"
4944
# Include free-threaded support
5045
CIBW_ENABLE: cpython-freethreading
5146
- name: Upload package

pixi.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ docs = ["furo", "matplotlib", "sphinx_gallery", "sphinx-design"]
3939
requires = ["meson-python>=0.18.0", "Cython>=3.1.0", "scikit-learn>=1.7.0"]
4040
build-backend = "mesonpy"
4141

42+
# Needed on Windows CI to compile with Visual Studio compiler
43+
# otherwise Meson detects a MINGW64 platform and use MINGW64
44+
# toolchain
4245
[tool.meson-python.args]
4346
setup = ['--vsenv']
4447

@@ -110,12 +113,6 @@ build-wheel = "rm -rf dist && python -m build -wnx -Cinstall-args=--tags=runtime
110113
build-sdist = "rm -rf dist && python -m build --sdist"
111114
rebuild = "rm -rf build && pip install --no-deps --force-reinstall -e ."
112115

113-
# Needed on Windows CI to compile with Visual Studio compiler
114-
# otherwise Meson detects a MINGW64 platform and use MINGW64
115-
# toolchain
116-
[tool.pixi.feature.build.target.win-64.tasks]
117-
rebuild = "rm -rf build && pip install --no-deps --force-reinstall -e . -Csetup-args=--vsenv"
118-
119116
[tool.pixi.feature.static.tasks]
120117
fmt = "ruff format"
121118
lint = "ruff check . --fix"

0 commit comments

Comments
 (0)