Skip to content

Commit 343bd17

Browse files
authored
#45353 Updates basic config with latest apps/engines (#49)
* Publish2 hooks moved into engines and publish2 app * Bumps minimum core version
1 parent 5dee2af commit 343bd17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+40
-7016
lines changed

core/core_api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
location:
1515
type: app_store
1616
name: tk-core
17-
version: v0.18.116
17+
version: v0.18.117

env/includes/3dsmax/apps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ includes:
1919

2020
3dsmax.apps.tk-multi-publish2:
2121
help_url: "@common.apps.tk-multi-publish2.help_url"
22-
collector: "{config}/tk-multi-publish2/basic/collector.py:{config}/tk-multi-publish2/3dsmax.basic/collector.py"
22+
collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
2323
publish_plugins:
2424
- '@common.settings.tk-multi-publish2.publish_file'
2525
- '@common.settings.tk-multi-publish2.upload_version'
2626
- name: Begin file versioning
27-
hook: "{config}/tk-multi-publish2/3dsmax.basic/start_version_control.py"
27+
hook: "{engine}/tk-multi-publish2/basic/start_version_control.py"
2828
settings: {}
2929
- name: Publish to Shotgun
30-
hook: "{config}/tk-multi-publish2/3dsmax.basic/publish_max_session.py"
30+
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
3131
settings: {}
3232
location: "@common.apps.tk-multi-publish2.location"
3333

env/includes/common/apps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ common.apps.tk-multi-pythonconsole:
3333

3434
common.apps.tk-multi-publish2.location:
3535
type: app_store
36-
version: v1.1.9
3736
name: tk-multi-publish2
37+
version: v2.0.2
3838

3939
common.apps.tk-multi-loader2.location:
4040
type: app_store
@@ -49,7 +49,7 @@ common.apps.tk-multi-shotgunpanel.location:
4949
common.apps.tk-multi-launchapp.location:
5050
type: app_store
5151
name: tk-multi-launchapp
52-
version: v0.9.11
52+
version: v0.9.13
5353

5454
common.apps.tk-multi-setframerange:
5555
location:

env/includes/common/engines.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515
common.engines.tk-3dsmaxplus.location:
1616
type: app_store
1717
name: tk-3dsmaxplus
18-
version: v0.4.1
18+
version: v0.5.1
1919

2020
# Houdini
2121
common.engines.tk-houdini.location:
2222
type: app_store
2323
name: tk-houdini
24-
version: v1.2.7
24+
version: v1.3.0
2525

2626
# Maya
2727
common.engines.tk-maya.location:
2828
type: app_store
2929
name: tk-maya
30-
version: v0.8.3
30+
version: v0.9.1
3131

3232
# Nuke
3333
common.engines.tk-nuke.location:
3434
type: app_store
3535
name: tk-nuke
36-
version: v0.8.5
36+
version: v0.9.4
3737

3838
# Photoshop
3939
common.engines.tk-photoshopcc.location:
4040
type: app_store
4141
name: tk-photoshopcc
42-
version: v1.1.7
42+
version: v1.2.0
4343

4444
# Flame
4545
common.engines.tk-flame.location:
@@ -51,18 +51,17 @@ common.engines.tk-flame.location:
5151
common.engines.tk-desktop.location:
5252
type: app_store
5353
name: tk-desktop
54-
version: v2.3.10
54+
version: v2.4.0
5555

5656
# Shell
5757
common.engines.tk-shell.location:
5858
type: app_store
5959
name: tk-shell
60-
version: v0.5.4
60+
version: v0.6.0
6161

6262
# shotgun
6363
common.engines.tk-shotgun.location:
6464
type: app_store
6565
name: tk-shotgun
66-
version: v0.6.0
67-
66+
version: v0.7.0
6867

env/includes/common/frameworks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ frameworks:
2929
name: tk-framework-shotgunutils
3030
tk-framework-adminui_v0.x.x:
3131
location:
32-
version: v0.1.6
32+
version: v0.2.0
3333
type: app_store
3434
name: tk-framework-adminui
3535
tk-framework-widget_v0.2.x:
@@ -39,6 +39,6 @@ frameworks:
3939
name: tk-framework-widget
4040
tk-framework-desktopserver_v1.x.x:
4141
location:
42-
version: v1.3.0
42+
version: v1.3.1
4343
type: app_store
4444
name: tk-framework-desktopserver

env/includes/common/settings/tk-multi-publish2.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,14 @@
88
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
99
# not expressly granted therein are reserved by Shotgun Software Inc.
1010

11-
# A mapping of SG publish types to file extensions. The basic file publisher
12-
# will use the publish type matching the extension if it exists in this list,
13-
# otherwise, the publish type will simply be the extension + " File". To
14-
# associate other extensions with existing publish types or to add new Publish
15-
# types, simply update the list below. The format is:
16-
# - [Publish Type, ext1, ext2, ext3, ...]
17-
publish_type_to_extensions: &file_types
18-
- [Alembic Cache, abc]
19-
- [3dsmax Scene, max]
20-
- [NukeStudio Project, hrox]
21-
- [Houdini Scene, hip, hipnc]
22-
- [Maya Scene, ma, mb]
23-
- [Nuke Script, nk]
24-
- [Photoshop Image, psd, psb]
25-
- [Rendered Image, dpx, exr]
26-
- [Texture, tif, tiff, tx, tga, dds]
27-
- [Image, jpeg, jpg, png]
28-
- [Movie, mov, mp4]
29-
30-
image_publish_type_to_extensions: &image_file_types
31-
- [Photoshop Image, psd, psb]
32-
- [Rendered Image, dpx, exr]
33-
- [Texture, tif, tiff, tx, tga, dds]
34-
- [Image, jpeg, jpg, png]
35-
- [Movie, mov, mp4]
36-
3711
common.settings.tk-multi-publish2.publish_file:
3812
name: Publish to Shotgun
39-
hook: "{config}/tk-multi-publish2/basic/publish_file.py"
40-
settings:
41-
File Types: *file_types
13+
hook: "{self}/publish_file.py"
14+
settings: {}
4215

4316
common.settings.tk-multi-publish2.upload_version:
4417
name: Upload for review
45-
hook: "{config}/tk-multi-publish2/basic/upload_version.py"
18+
hook: "{self}/upload_version.py"
4619
settings: {}
4720

48-
common.settings.tk-multi-publish2.publish_photoshop_document:
49-
name: Publish to Shotgun
50-
hook: "{config}/tk-multi-publish2/photoshopcc.basic/publish_photoshop_document.py"
51-
settings:
52-
File Types: *file_types
5321

env/includes/desktop/project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ desktop.project:
2525

2626
tk-multi-publish2:
2727
help_url: "@common.apps.tk-multi-publish2.help_url"
28-
collector: "{config}/tk-multi-publish2/basic/collector.py"
28+
collector: "{self}/collector.py"
2929
publish_plugins:
3030
- '@common.settings.tk-multi-publish2.publish_file'
3131
- '@common.settings.tk-multi-publish2.upload_version'

env/includes/houdini/apps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ includes:
1919

2020
houdini.apps.tk-multi-publish2:
2121
help_url: "@common.apps.tk-multi-publish2.help_url"
22-
collector: "{config}/tk-multi-publish2/basic/collector.py:{config}/tk-multi-publish2/houdini.basic/collector.py"
22+
collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
2323
publish_plugins:
2424
- '@common.settings.tk-multi-publish2.publish_file'
2525
- '@common.settings.tk-multi-publish2.upload_version'
2626
- name: Begin file versioning
27-
hook: "{config}/tk-multi-publish2/houdini.basic/start_version_control.py"
27+
hook: "{engine}/tk-multi-publish2/basic/start_version_control.py"
2828
settings: {}
2929
- name: Publish to Shotgun
30-
hook: "{config}/tk-multi-publish2/houdini.basic/publish_houdini_session.py"
30+
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
3131
settings: {}
3232
location: "@common.apps.tk-multi-publish2.location"
3333

env/includes/maya/apps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ includes:
1818

1919
maya.apps.tk-multi-publish2:
2020
help_url: "@common.apps.tk-multi-publish2.help_url"
21-
collector: "{config}/tk-multi-publish2/basic/collector.py:{config}/tk-multi-publish2/maya.basic/collector.py"
21+
collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
2222
publish_plugins:
2323
- '@common.settings.tk-multi-publish2.publish_file'
2424
- '@common.settings.tk-multi-publish2.upload_version'
2525
- name: Begin file versioning
26-
hook: "{config}/tk-multi-publish2/maya.basic/start_version_control.py"
26+
hook: "{engine}/tk-multi-publish2/basic/start_version_control.py"
2727
settings: {}
2828
- name: Publish to Shotgun
29-
hook: "{config}/tk-multi-publish2/maya.basic/publish_maya_session.py"
29+
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
3030
settings: {}
3131
location: "@common.apps.tk-multi-publish2.location"
3232

env/includes/nuke/apps.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ includes:
1919

2020
nuke.apps.tk-multi-publish2:
2121
help_url: "@common.apps.tk-multi-publish2.help_url"
22-
collector: "{config}/tk-multi-publish2/basic/collector.py:{config}/tk-multi-publish2/nuke.basic/collector.py"
22+
collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
2323
publish_plugins:
2424
- '@common.settings.tk-multi-publish2.publish_file'
2525
- '@common.settings.tk-multi-publish2.upload_version'
2626
- name: Begin file versioning
27-
hook: "{config}/tk-multi-publish2/nuke.basic/nuke_start_version_control.py"
27+
hook: "{engine}/tk-multi-publish2/basic/nuke_start_version_control.py"
2828
settings: {}
2929
- name: Begin file versioning
30-
hook: "{config}/tk-multi-publish2/nuke.basic/nukestudio_start_version_control.py"
30+
hook: "{engine}/tk-multi-publish2/basic/nukestudio_start_version_control.py"
3131
settings: {}
3232
- name: Publish to Shotgun
33-
hook: "{config}/tk-multi-publish2/nuke.basic/nuke_publish_script.py"
33+
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/nuke_publish_script.py"
3434
settings: {}
3535
- name: Publish to Shotgun
36-
hook: "{config}/tk-multi-publish2/nuke.basic/nukestudio_publish_project.py"
36+
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/nukestudio_publish_project.py"
3737
settings: {}
3838
location: "@common.apps.tk-multi-publish2.location"
3939

0 commit comments

Comments
 (0)