Skip to content

Commit

Permalink
Merge pull request #11142 from archesproject/jtw/fix-eol
Browse files Browse the repository at this point in the history
Normalize line endings #11141
  • Loading branch information
bferguso authored Jul 9, 2024
2 parents 1c3c7ce + 3cada2b commit eeda1b0
Show file tree
Hide file tree
Showing 69 changed files with 38,672 additions and 38,657 deletions.
6 changes: 0 additions & 6 deletions .eggs/README.txt

This file was deleted.

2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Normalize line endings
3fe93f1e11e517e06884c7a10591fa99074cb0fe
# Reformat python code with black (2024)
6d519d00e752448362b880b73c3641a562ee9ee3
eea27d316c5ff975556e15ccd4c11d7c393dd95c
Expand Down
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Known binary formats
*.png binary
*.jpg binary
*.ico binary
*.gif binary
*.ttf binary
*.woff binary
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ jobs:
run: |
black . --check --exclude=node_modules
- name: Check line endings
run: |
! git ls-files --eol | grep 'w/crlf\|w/mixed'
- name: Run frontend tests
run: |
npm run vitest
Expand Down
56 changes: 28 additions & 28 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
recursive-include arches *
include README.md
exclude Dockerfile
exclude manage.py
exclude arches/logs/*.txt
exclude arches/settings_local.py
exclude .*
exclude *.yml
recursive-exclude .eggs *
recursive-exclude .github *
recursive-exclude .idea *
recursive-exclude contributing *
recursive-exclude cypress *
recursive-exclude docker *
recursive-exclude node_modules *
recursive-exclude releases *
recursive-exclude tests *
recursive-exclude docs *
recursive-exclude virtualenv *
recursive-exclude webpack *
recursive-exclude arches/uploadedfiles *
recursive-exclude arches/staticfiles *
recursive-exclude arches/app/media/build *
global-exclude *.log
global-exclude *.pyc
global-exclude *.zip
global-exclude *.DS_Store
global-exclude *.orig
recursive-include arches *
include README.md
exclude Dockerfile
exclude manage.py
exclude arches/logs/*.txt
exclude arches/settings_local.py
exclude .*
exclude *.yml
recursive-exclude .eggs *
recursive-exclude .github *
recursive-exclude .idea *
recursive-exclude contributing *
recursive-exclude cypress *
recursive-exclude docker *
recursive-exclude node_modules *
recursive-exclude releases *
recursive-exclude tests *
recursive-exclude docs *
recursive-exclude virtualenv *
recursive-exclude webpack *
recursive-exclude arches/uploadedfiles *
recursive-exclude arches/staticfiles *
recursive-exclude arches/app/media/build *
global-exclude *.log
global-exclude *.pyc
global-exclude *.zip
global-exclude *.DS_Store
global-exclude *.orig
Loading

0 comments on commit eeda1b0

Please sign in to comment.