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.

Sign up for GitHub

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

Feature/update from template #6

Merged
merged 12 commits into from
Nov 2, 2024
Merged

Feature/update from template #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
deab297
ci: don't check for clean workspace any more
blooop Nov 1, 2024
1a20cdb
Merge pull request #14 from blooop/feature/ci_check_clean_workspace
blooop Nov 1, 2024
49226e5
ci: remove check clean workspace as part of ci
blooop Nov 2, 2024
2289528
env: add usd to git lfs
blooop Nov 2, 2024
d663356
Merge pull request #62 from blooop/feature/remove_check_clean_workspace
blooop Nov 2, 2024
339b6fd
build(deps): bump the dev-dependencies group across 1 directory with …
dependabot[bot] Nov 2, 2024
dc4f8d3
Merge pull request #63 from blooop/dependabot/pip/dev-dependencies-7f…
blooop Nov 2, 2024
26eac32
remove git global config command
blooop Nov 2, 2024
6cdd789
remove global
blooop Nov 2, 2024
68c7c19
feat: pull changes from remote template
blooop Nov 2, 2024
7aac261
Merge pull request #16 from blooop/feature/update_from_template
blooop Nov 2, 2024
eb56c08
update from template
blooop Nov 2, 2024
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
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_from_python_template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_from_template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down