Skip to content

Commit

Permalink
Repair shotgrid module
Browse files Browse the repository at this point in the history
  • Loading branch information
victorbartel authored and ClementHector committed Feb 7, 2022
1 parent 3d08f12 commit e5e5698
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
[submodule "openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api"]
path = openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api
url = https://bitbucket.org/ftrack/ftrack-python-api.git
[submodule "openpype/modules/shotgrid/leech_server"]
path = openpype/modules/shotgrid/leech_server
[submodule "openpype/modules/default_modules/shotgrid/leech_server"]
path = openpype/modules/default_modules/shotgrid/leech_server
url = https://github.com/Ellipsanime/shotgrid-leecher.git
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### First steps

At the beginning you have to create a working environment, you can achieve it with bootstrap scripts from `tools` folder. Just follow the tutorial from the main `README.md` [file](../../../README.md).
At the beginning you have to create a working environment, you can achieve it with bootstrap scripts from `tools` folder. Just follow the tutorial from the main `README.md` [file](../../../../README.md).

### Hooks

Expand Down
5 changes: 5 additions & 0 deletions openpype/modules/default_modules/shotgrid/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from openpype.modules.default_modules.shotgrid.shotgrid_module import (
ShotgridModule,
)

__all__ = ("ShotgridModule",)
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import os
from typing import Optional, Dict, Any
from openpype.modules.shotgrid.lib import credentials
from openpype.modules.shotgrid.lib import settings
from openpype.modules.default_modules.shotgrid.lib import settings, credentials
import shotgun_api3

from openpype.modules import (
PypeModule,
from openpype.modules import OpenPypeModule

from openpype_interfaces import (
ITrayModule,
IPluginPaths,
ILaunchHookPaths,
)
from openpype.modules.shotgrid.tray.shotgrid_tray import ShotgridTrayWrapper
from openpype.modules.default_modules.shotgrid.tray.shotgrid_tray import (
ShotgridTrayWrapper,
)

SHOTGRID_MODULE_DIR = os.path.dirname(os.path.abspath(__file__))


class ShotgridModule(PypeModule, ITrayModule, IPluginPaths, ILaunchHookPaths):
class ShotgridModule(
OpenPypeModule, ITrayModule, IPluginPaths, ILaunchHookPaths
):
name: str = "shotgrid"
enabled: bool = False
project_id: Optional[str] = None
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
from assertpy import assert_that

import openpype.modules.shotgrid.lib.credentials as sut
import openpype.modules.default_modules.shotgrid.lib.credentials as sut


def test_missing_shotgrid_url():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

from openpype import style
from openpype import resources
from openpype.modules.shotgrid.lib import credentials
from openpype.modules.shotgrid.lib import settings
from openpype.modules.default_modules.shotgrid.lib import settings, credentials


class CredentialsDialog(QtWidgets.QDialog):
Expand Down
3 changes: 0 additions & 3 deletions openpype/modules/shotgrid/__init__.py

This file was deleted.

0 comments on commit e5e5698

Please sign in to comment.