Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ cuda/_version.py export-subst
*.hpp binary
# git should not convert line endings in PNG files
*.png binary
# SCM syntax highlighting & preventing 3-way merges
pixi.lock merge=binary linguist-language=YAML linguist-generated=true
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,3 @@ cython_debug/

# Dont ignore
!.github/actions/build/
# pixi environments
.pixi/*
!.pixi/config.toml
.gdb_history
3 changes: 1 addition & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ repos:
- repo: local
hooks:
- id: check-spdx
exclude: 'pixi\.lock$'
name: Check SPDX Headers
entry: python ./toolshed/check_spdx.py
language: python
Expand Down Expand Up @@ -52,7 +51,7 @@ repos:
- id: check-yaml
- id: debug-statements
- id: end-of-file-fixer
exclude: &gen_exclude '^(?:cuda_bindings/cuda/bindings/.*\.in?|cuda_bindings/docs/source/module/.*\.rst?|pixi\.lock)$'
exclude: &gen_exclude '^(?:cuda_bindings/cuda/bindings/.*\.in?|cuda_bindings/docs/source/module/.*\.rst?)$'
- id: mixed-line-ending
- id: trailing-whitespace
exclude: *gen_exclude
Expand Down
Loading