Commit graph

19918 commits

Author SHA1 Message Date
Roy Nieterau
5b1f6eb30c Move logic closer to where it's used 2022-03-24 14:23:27 +01:00
Roy Nieterau
9997acbbea Encapsulate version data completely into its own function 2022-03-24 14:22:49 +01:00
Roy Nieterau
b128e0addf Override stored repre context udim for backwards compatibility 2022-03-24 14:21:32 +01:00
Roy Nieterau
47259f8ef7 Add todo to move get subset group logic 2022-03-24 00:21:44 +01:00
Roy Nieterau
d6c682723d Remove todo since assetEntity already comes from Collectors + re-use families variable 2022-03-24 00:19:16 +01:00
Roy Nieterau
79286ead4b Re-use get families logic 2022-03-24 00:16:32 +01:00
Roy Nieterau
8edfb3f7d3 Simplify profile filtering 2022-03-24 00:10:59 +01:00
Roy Nieterau
3fd2d02014 Move logic to clarify what should be removed/moved and bring logic closer to where it's used 2022-03-23 23:55:40 +01:00
Roy Nieterau
177e244bd8 Remove prepare anatomy data logic that is already collected/generated in CollectAnatomyContextData and CollectAnatomyInstanceData.
This currently was duplicated logic and should not be handled in the Integrator
2022-03-23 23:45:24 +01:00
Roy Nieterau
8996280224 Reduce duplicated logic by implementing resolve_profile method 2022-03-23 23:38:05 +01:00
Roy Nieterau
4c0309263c Merge remote-tracking branch 'upstream/develop' into refactor_integrator
# Conflicts:
#	openpype/plugins/publish/integrate_new.py
2022-03-23 17:52:49 +01:00
Jakub Trllo
5901d45e5e
Merge pull request #2912 from pypeclub/enhancement/OP-2925_move-remaining-plugins
General: Move remaining plugins from avalon
2022-03-22 16:28:54 +01:00
Jakub Trllo
37f152adbf update avalon core 2022-03-22 16:27:57 +01:00
Jakub Trllo
ac6182c792 Merge branch 'develop' into enhancement/OP-2925_move-remaining-plugins 2022-03-22 16:14:22 +01:00
Jakub Trllo
83fd67eb8d
Merge pull request #2918 from pypeclub/enhancement/OP-2949_move-pipeline-constants
General: Move pipeline constants to OpenPype
2022-03-22 16:10:49 +01:00
Jakub Trllo
bbb12d283c
Merge pull request #2927 from pypeclub/enhancement/removed_unused_code
General: Removed silo references and terminal splash
2022-03-22 14:39:47 +01:00
Jakub Trllo
42a79966a3 fix trailing spaces 2022-03-22 13:38:38 +01:00
Jakub Trllo
6a6cbe6b99 removed terminal splash 2022-03-22 12:32:13 +01:00
Jakub Trllo
d721ed94e4 simplified loader to not use registered root 2022-03-22 12:31:50 +01:00
Jakub Trllo
5e5fc4ec55 removed silo references 2022-03-22 12:31:14 +01:00
Jakub Trllo
87a0663f52
Merge pull request #2926 from pypeclub/bugfix/dont_print_record_on_oserror
General: Don't print log record on OSError
2022-03-22 12:08:39 +01:00
Jakub Trllo
8b572a0d3c just handle error when is caused by OSError 2022-03-21 18:59:34 +01:00
Jakub Trllo
d8c7b11a7a Merge branch 'develop' into enhancement/OP-2925_move-remaining-plugins 2022-03-21 13:41:45 +01:00
Jakub Trllo
a1f46e7d1b Merge branch 'develop' into enhancement/OP-2949_move-pipeline-constants 2022-03-21 13:38:38 +01:00
Jakub Trllo
22f1a30710
Merge pull request #2924 from pypeclub/bugfix/fix_import_in_hiero
Hiero: Fix import of 'register_event_callback'
2022-03-21 10:20:19 +01:00
Jakub Trllo
9d98d5ea2e fix import of 'register_event_callback' 2022-03-21 09:50:34 +01:00
pypebot
35b2d219d7
[Automated] Merged main into develop 2022-03-19 04:35:12 +01:00
OpenPype
1b5ca6a86e [Automated] Bump version 2022-03-19 03:35:01 +00:00
pypebot
7bae91b292
[Automated] Merged develop into main 2022-03-19 04:28:39 +01:00
Jakub Trllo
5aaa4c159b
Merge pull request #2914 from pypeclub/enhancement/OP-2947_move-formatting-and-workfile-functions
General: Move formatting and workfile functions
2022-03-18 18:25:46 +01:00
Jakub Trllo
32bf6cb3e0 fix last workfile 2022-03-18 18:02:34 +01:00
Milan Kolar
be9201b41d
Merge pull request #2919 from pypeclub/CI/change_version_up_logic 2022-03-18 17:45:37 +01:00
Jakub Trllo
296c0c7877
Merge pull request #2916 from pypeclub/enhancement/deadline_use_headless_argument
Deadline: Add headless argument
2022-03-18 17:04:20 +01:00
Jakub Trllo
fcbb144808
Merge pull request #2905 from pypeclub/bugfix/OP-2942_Ftrack-missing-id-on-editorial-publish
Ftrack: Missing Ftrack id after editorial publish
2022-03-18 17:03:53 +01:00
Milan Kolar
952fc09368 fix hound nitpicking 2022-03-18 16:57:07 +01:00
Milan Kolar
f804b5f7e1 fix typo 2022-03-18 16:56:36 +01:00
Milan Kolar
4f643a2928 Only raise minor version if Bump Minor label is found 2022-03-18 16:46:40 +01:00
Jakub Trllo
93eca512b8 use ObjectId imported from bson instead of avalon.io 2022-03-18 16:23:00 +01:00
Jakub Trllo
e323429ab4 moved host workfile extensions 2022-03-18 16:08:15 +01:00
Jakub Trllo
89bdf2965c moved AVALON_CONTAINER_ID from avalon into openpype 2022-03-18 15:54:19 +01:00
Jakub Trllo
10c7fb21e4 use headless in submit publish job 2022-03-18 15:34:42 +01:00
Jakub Trllo
4a8a7b8688 add headless argument 2022-03-18 15:34:30 +01:00
Jakub Trllo
050851731a renamed 'thumbnails.py' to 'thumbnail.py' 2022-03-18 15:19:34 +01:00
Jakub Trllo
65bc619bcb use moved workfile functions 2022-03-18 14:57:02 +01:00
Jakub Trllo
e961144969 moved functions to get last workfile into avalon context lib functions 2022-03-18 14:55:53 +01:00
Jakub Trllo
6eaf7017eb replaced 'format_template_with_optional_keys' with 'StringTemplate' 2022-03-18 14:20:20 +01:00
Jakub Trllo
e8d0839caf
Change label to 'Actions'
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2022-03-18 14:06:12 +01:00
Jakub Trllo
5fcc6a0358 remove unused imports 2022-03-18 13:37:24 +01:00
Jakub Trllo
8e1ec6d251
Merge pull request #2906 from pypeclub/enhancement/OP-2818_Workfile-name-ftrack-attribute
Ftrack: Fill workfile in custom attribute
2022-03-18 13:27:42 +01:00
Jakub Trllo
0710540aa4 changed imports of moved plugins/actions 2022-03-18 13:17:19 +01:00