Skip to content

Commit

Permalink
Updated display group name in dialog.py
Browse files Browse the repository at this point in the history
Updated .pre-commit-config.yaml
pre-commit updated tk-nuke_scene_operations.py
Updated .gitignore for .idea and venv folders
  • Loading branch information
rob-aitchison committed Aug 27, 2020
1 parent c613aee commit 677267d
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,9 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject

# Jetbrains Pycharm
.idea

# Virtual Environment
venv
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/tk-multi-breakdown.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ exclude: "ui\/.*py$"
# List of super useful formatters.
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.4.0
rev: v3.2.0
hooks:
# Ensures the code is syntaxically correct
- id: check-ast
language_version: python3
# Ensures a yaml file is properly formatted
- id: check-yaml
# Ensures a file name will resolve on all platform
- id: check-case-conflict
# Checks files with the execute bit set have shebangs
Expand All @@ -33,7 +35,7 @@ repos:
- id: trailing-whitespace
# Leave black at the bottom so all touchups are done before it is run.
- repo: https://github.com/ambv/black
rev: 19.10b0
rev: stable
hooks:
- id: black
language_version: python3
6 changes: 5 additions & 1 deletion hooks/tk-nuke_scene_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ def scan_scene(self):
for file in files:
path = file.filename().replace("/", os.path.sep)
reads.append(
dict(node=clip.activeItem(), type="Clip", path=path,)
dict(
node=clip.activeItem(),
type="Clip",
path=path,
)
)

# Hiero doesn't have nodes to check, so just return the clips.
Expand Down
2 changes: 1 addition & 1 deletion python/tk_multi_breakdown/scene_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def process_result(self, result):
if entity is None:
entity_type = "Unknown Type"
else:
entity_type = entity["type"]
entity_type = shotgun_globals.get_type_display_name(entity["type"])

asset_type = sg_data["entity.Asset.sg_asset_type"]

Expand Down

0 comments on commit 677267d

Please sign in to comment.