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.

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

Delete .gitattributes #393

Merged
merged 1 commit into from
Nov 15, 2024

Conversation

khaledsulayman
Copy link
Member

It seems like at some point when I was working on #364 (likely back when I was trying to stage and push the 4GB .gguf file), a .gitattributes file was generated. This seems to confuse setuptools-scm during the release process, leading it to name the buld for v0.6.0 as v.0.6.1.dev0, since it was expecting the files in .gitattributes to be git LFS objects. This fix removes .gitattributes, as we aren't actually using LFS at all.

Signed-off-by: Khaled Sulayman <[email protected]>
@khaledsulayman khaledsulayman force-pushed the ks-remove-gitattributes branch from 8e8ad3c to 72b1c12 Compare November 15, 2024 19:43
@mergify mergify bot added testing Relates to testing ci-failure labels Nov 15, 2024
@mergify mergify bot added one-approval and removed ci-failure labels Nov 15, 2024
@mergify mergify bot merged commit 4e90549 into instructlab:main Nov 15, 2024
5 checks passed
@mergify mergify bot removed the one-approval label Nov 15, 2024
@tiran
Copy link
Contributor

tiran commented Nov 15, 2024

For the record, the file was not only confusing setuptools-scm. It was also confusing regular git clients. The model file was stored as a regular git object, but the .gitattribute file had *.model filter=lfs diff=lfs merge=lfs -text. This caused these warnings, which then confused setuptools-scm.

$ git reset --hard
HEAD is now at 01fbe02 Merge pull request #386 from instructlab/dependabot/github_actions/DavidAnson/markdownlint-cli2-action-18.0.0
Encountered 1 file that should have been a pointer, but wasn't:
        tests/testdata/models/instructlab/granite-7b-lab/tokenizer.model
$ git status
Not currently on any branch.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   tests/testdata/models/instructlab/granite-7b-lab/tokenizer.model

no changes added to commit (use "git add" and/or "git commit -a")

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testing Relates to testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants