MAYA-106529 - MayaUSD: Cleanup old UFE conditionals #746
Conversation
* The latest Maya PR118 has UFE 0.2.19, so removed any special UFE code before that.
test/lib/ufe/CMakeLists.txt
Outdated
| testAttribute.py | ||
| testAttributes.py | ||
| testComboCmd.py | ||
| testContextOps.py | ||
| testDeleteCmd_v2.py |
There was a problem hiding this comment.
I split out the UFE v2 delete test into a separate file to include here.
There was a problem hiding this comment.
You can see this block of tests are all V2 only. So most of the skipif tags have been removed. I had to keep a couple since they are v0.20.0.
test/lib/ufe/testDeleteCmd_v2.py
Outdated
| UFE Feature : SceneItemOps | ||
| Maya Feature : delete | ||
| Action : Remove object from scene. | ||
| Applied On Command Arguments: |
There was a problem hiding this comment.
This entire file is a copy of the original with just this one test. I changed this comment to be from command args (instead of selection).
seando-adsk
added
core
* Put "test" back in file "testDeleteCmd.py" and removed new "testDeleteCmd_v2.py". Created new ufeUtils.ufeFeatureSetVersion() for use by tests when a v2 (or greater) check is needed. * Removed old MayaPR checks.
| @@ -327,7 +327,6 @@ def testComboMaya(self): | |||
|
|
|||
| self.runTestCombo(expectedTRS) | |||
|
|
|||
| @unittest.skipUnless(mayaUtils.previewReleaseVersion() >= 115, 'Requires Maya fixes only available in Maya Preview Release 115 or later.') | |||
There was a problem hiding this comment.
The current Maya PR is PR118, so we don't need these older checks.
|
|
||
| If you need to test for a specific UFE preview release version then check | ||
| the cmake variable UFE_PREVIEW_VERSION_NUM. This is also set as an env | ||
| for the python tests. |
There was a problem hiding this comment.
Ack, my mistake, got confused with
and clearly they're not the same.
|
|
||
| If you need to test for a specific UFE preview release version then check | ||
| the cmake variable UFE_PREVIEW_VERSION_NUM. This is also set as an env | ||
| for the python tests. |
There was a problem hiding this comment.
Ack, my mistake, got confused with
and clearly they're not the same.
* Put back accidental deletion of UFE v1 specific code.
* Added conditional for test that requires UFE v2.
seando-adsk
added
the
ready-for-merge
|
@kxl-adsk My latest maya-usd preflight fixed all the real preflight problem, but there was a glitch with master Windows python3 build. My previous preflight passed on that platform. |
MAYA-106529 - MayaUSD: Cleanup old UFE conditionals