diff --git a/.gitattributes b/.gitattributes index d32e0e9..da2f70b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,6 +20,7 @@ *.dae filter=lfs diff=lfs merge=lfs -text *.obj filter=lfs diff=lfs merge=lfs -text *.ply filter=lfs diff=lfs merge=lfs -text +*.usd filter=lfs diff=lfs merge=lfs -text # Compiled libraries *.a filter=lfs diff=lfs merge=lfs -text diff --git a/pyproject.toml b/pyproject.toml index c264e60..9888540 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,10 +38,10 @@ cargo_rocker = { path = ".", editable = true } test = [ "black>=23,<=24.10.0", "pylint>=3.2.5,<=3.3.1", - "pytest-cov>=4.1,<=5.0.0", + "pytest-cov>=4.1,<=6.0.0", "pytest>=7.4,<=8.3.3", - "hypothesis>=6.104.2,<=6.115.5", - "ruff>=0.5.0,<=0.7.1", + "hypothesis>=6.104.2,<=6.116.0", + "ruff>=0.5.0,<=0.7.2", "coverage>=7.5.4,<=7.6.4", ] @@ -82,7 +82,7 @@ update-lock-push = { depends_on = ["update-lock", "push"] } fix = { depends_on = ["update-lock", "format", "ruff-lint"] } fix-commit-push = { depends_on = ["fix", "commit-format", "update-lock-push"] } ci-no-cover = { depends_on = ["style", "test"] } -ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "coverage", "coverage-report"] } +ci = { depends_on = ["format","ruff-lint", "pylint", "coverage", "coverage-report"] } ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" setup-git-merge-driver = "git config merge.ourslock.driver true" diff --git a/scripts/update_from_python_template.sh b/scripts/update_from_python_template.sh index 0dacdb4..f69c90a 100755 --- a/scripts/update_from_python_template.sh +++ b/scripts/update_from_python_template.sh @@ -2,7 +2,7 @@ #THIS IS USED TO UPDATE THIS TEMPLATE FROM THE MAIN PYTHON TEMPLATE https://github.com/blooop/python_template. YOU SHOULD NOT NEED TO USE THIS, PLEASE USE update_from_template.sh INSTEAD IF YOU WANT TO PULL UPDATES FROM TEMPLATE_ROCKER -git config --global pull.rebase false +git config pull.rebase false git remote add template https://github.com/blooop/python_template.git git fetch --all git checkout main && git pull origin main diff --git a/scripts/update_from_template.sh b/scripts/update_from_template.sh index b0cbb7f..9313b96 100755 --- a/scripts/update_from_template.sh +++ b/scripts/update_from_template.sh @@ -2,7 +2,7 @@ #THIS IS THE CORRECT TEMPLATE UPDATE SCRIPT, NOT update_from_python_template.sh -git config --global pull.rebase false +git config pull.rebase false git remote add template https://github.com/blooop/template_rocker.git git fetch --all git checkout main && git pull origin main