SG-38307 Remove Python 2 compatibility - Part 6 - Everything else #1030
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eduardoChaucaGallegos
changed the title
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## ticket/SG-38307-python2-removal-pyyaml #1030 +/- ##
==========================================================================
+ Coverage 79.75% 79.78% +0.02%
==========================================================================
Files 198 197 -1
Lines 20732 20594 -138
==========================================================================
- Hits 16535 16430 -105
+ Misses 4197 4164 -33 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
I'm halfway through reviewing this. It's too long, but it's a great update.
Note: I don't think we should touch tank_vendor files. Maybe the ruamel_yaml, or consider updating that external library to a later version. python-api will be updated in a different ticket, let's revert these changes.
julien-lang
requested changes
Jun 20, 2025
| if params.get_project_path(primary_storage_name, "linux2"): | ||
| location["linux2"] = "%s/tank" % params.get_project_path( | ||
| primary_storage_name, "linux2" | ||
| if params.get_project_path(primary_storage_name, "linux"): |
There was a problem hiding this comment.
@eduardoChaucaGallegos what about this finding?
Is this a bug we were not aware of?
julien-lang
reviewed
Jun 23, 2025
eduardoChaucaGallegos
requested review from
julien-lang and
carlos-villavicencio-adsk
julien-lang
requested changes
Jul 7, 2025
This was referenced Jul 8, 2025
julien-lang
force-pushed
the
ticket/SG-38307-python2-removal-code
branch
from
4e21eff to
072d481
Compare
julien-lang
changed the title
julien-lang
changed the title
carlos-villavicencio-adsk
approved these changes
Jul 9, 2025
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
This reverts commit b01dc45.
Base automatically changed from
ticket/SG-38307-python2-removal-pyyaml
to
master
July 31, 2025 19:52
carlos-villavicencio-adsk
pushed a commit
that referenced
this pull request
Jul 31, 2025
) * Remove Python 2 Compatibility * Apply suggestion from @julien-lang * Remove useless Python 2 support code * Remove six * fixup! Remove useless Python 2 support code * Revert wrong change * Update tk-shell version used by CI tests to a version that does use six * fixup! Update tk-shell version used by CI tests to a version that does use six * Revert "Remove six" This reverts commit b01dc45. * custom dumps pickle func fixed * keep six * Restore json.py copy for long term deprecation process --------- Co-authored-by: Julien Langlois <julien.langlois@autodesk.com> Co-authored-by: Julien Langlois <16244608+julien-lang@users.noreply.github.com>
carlos-villavicencio-adsk
added a commit
that referenced
this pull request
Jul 31, 2025
* Replace `imp` Format Fix syntax Add module to `sys.modules` Fix test Replace `utcnow()` for Python 3.12 (#1025) Bump python-api to v3.8.4 (#1028) * Bump python-api to v3.8.4 * Fix `test_default_configuration_location_without_suggestions` (#1029) Update the import system hook to use `importlib` Format to make hound 🐕🦺 happy Some feedback applied Use `argparse` Replace `utcnow()` for Python 3.12 (#1025) Bump python-api to v3.8.4 (#1028) * Bump python-api to v3.8.4 * Fix `test_default_configuration_location_without_suggestions` (#1029) * Update python/tank/util/pyside6_patcher.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * add support for QtWebEngineWidgets (#1043) * [SG-9141] pip installed core can't use the ToolkitManager to bootstrap (#1033) * move the bootstrap hook to the bootstrap folder in order to be able to bootstrap the engine when sgtk is installed using pip * add test file to cover engine bootstrap when sgtk has been installed using pip * remove blank line * do not return unused value * move and rename hook to his previous name to keep consistancy with existing workflows * update setup.py file to make sure the new hook folder will be included with the packages * improve documentation * run black manually to make hound happy as tests are not included in pre-commit actions * improve code comments * Apply suggestions from code review --------- Co-authored-by: Martin Chesnay <104032692+mchesnay@users.noreply.github.com> * SG-38307 Remove Python 2 compatibility - Part 1 - Simplified super prototype (#1038) * SG-38307 Remove Python 2 compatibility - Part 2 - Removed useless __future__ imports (#1039) * Removed __future__ functions --------- Co-authored-by: Julien Langlois <julien.langlois@autodesk.com> * SG-38307 Remove Python 2 compatibility - Part 3 - Replace "linux2" key to "linux" (#1037) * python2 key by only python key * sys.platform used instead sgsix.platform --------- Co-authored-by: Julien Langlois <julien.langlois@autodesk.com> * SG-38307 Remove Python 2 compatibility - Part 4 - Cleanup six.moves imports and other imports (#1040) * six.moves * Test fixup CI --------- Co-authored-by: Eduardo Chauca <eduardo.chauca@autodesk.com> * SG-38307 Remove Python 2 compatibility - Part 5 - Simplify pyyaml bundle (#1041) * Update pyaml - remove python2 copy Also add an option to the script to specify the tag to use instead of latest * Run script --------- Co-authored-by: Eduardo Chauca <eduardo.chauca@autodesk.com> * SG-38307 Remove Python 2 compatibility - Part 6 - Everything else (#1030) * Remove Python 2 Compatibility * Apply suggestion from @julien-lang * Remove useless Python 2 support code * Remove six * fixup! Remove useless Python 2 support code * Revert wrong change * Update tk-shell version used by CI tests to a version that does use six * fixup! Update tk-shell version used by CI tests to a version that does use six * Revert "Remove six" This reverts commit b01dc45. * custom dumps pickle func fixed * keep six * Restore json.py copy for long term deprecation process --------- Co-authored-by: Julien Langlois <julien.langlois@autodesk.com> Co-authored-by: Julien Langlois <16244608+julien-lang@users.noreply.github.com> * SG-39029 Make core not importing PySide/Qt when importing the library (#1022) * Move the explicit UI authentication module imports * Missing one thing * Cleanup unused ret_val variable unittest.main calls sys.exit by default * Fixup broken tests * Minor fixup found by coPilot * Fix import * Remove import six --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Barbara Laigneau <38566472+barbara-darkshot@users.noreply.github.com> Co-authored-by: Martin Chesnay <104032692+mchesnay@users.noreply.github.com> Co-authored-by: Eduardo Chauca <166560435+eduardoChaucaGallegos@users.noreply.github.com> Co-authored-by: Julien Langlois <julien.langlois@autodesk.com> Co-authored-by: Julien Langlois <16244608+julien-lang@users.noreply.github.com> Co-authored-by: Eduardo Chauca <eduardo.chauca@autodesk.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
six.string_types/six.text_typebystrRemove copy of thesixmodulesgtk.util.jsonby Python's defaultjsonmodulesgutilsand calls toensure_binary/ensure_string/ensure_textRemove Python 2 PR orders