Skip to content

Commit

Permalink
Remove unnecessary files and fixed module paths
Browse files Browse the repository at this point in the history
  • Loading branch information
tpoveda committed Nov 10, 2019
1 parent 0011f85 commit 1e32068
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 34 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include artellapipe/libs/maya/__logging__.ini
include artellapipe/dccs/maya/__logging__.ini
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# artellapipe-libs-maya
# artellapipe-ddcs-maya
============================================================

Maya libraries for ArtellaPipe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

"""
Initialization module for artellapipe-libs
Initialization module for artellapipe-dccs
"""

from __future__ import print_function, division, absolute_import
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@ def init(do_reload=False):

logging.config.fileConfig(get_logging_config(), disable_existing_loggers=False)

import sentry_sdk
sentry_sdk.init("https://fb3880746e1240e099368d3b2b21419f@sentry.io/1780995")

from tpPyUtils import importer

class ArtellaMayaLib(importer.Importer, object):
class ArtellaMayaDcc(importer.Importer, object):
def __init__(self):
super(ArtellaMayaLib, self).__init__(module_name='artellapipe.libs.maya')
super(ArtellaMayaDcc, self).__init__(module_name='artellapipe.dccs.maya')

def get_module_path(self):
"""
Expand All @@ -38,17 +35,13 @@ def get_module_path(self):
try:
mod_dir = os.path.dirname(__file__)
except Exception:
try:
import tpDccLib
mod_dir = tpDccLib.__path__[0]
except Exception:
return None
return None

return mod_dir

packages_order = []

artella_maya_lib = importer.init_importer(importer_class=ArtellaMayaLib, do_reload=False)
artella_maya_lib = importer.init_importer(importer_class=ArtellaMayaDcc, do_reload=False)
artella_maya_lib.import_packages(order=packages_order, only_packages=False)
if do_reload:
artella_maya_lib.reload_all()
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions artellapipe/dccs/maya/core/toolbox.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import tpDccLib as tp

import artellapipe.register
from artellapipe.core import toolbox


class MayaToolBox(toolbox.ToolBox, object):
def __init__(self, project, parent=None):
if parent is None:
parent = tp.Dcc.get_main_window()
super(MayaToolBox, self).__init__(project=project, parent=parent)


artellapipe.register.register_class('ToolBox', MayaToolBox)
Empty file.
14 changes: 0 additions & 14 deletions artellapipe/libs/maya/managers/toolsmanager.py

This file was deleted.

6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[metadata]
name = artellapipe-libs-maya
name = artellapipe-dccs-maya
description = Maya libraries for ArtellaPipe
long_description = file: README.rst
long_description_content_type = text/x-rst
version = attr: artellapipe.libs.maya.__version__.__version__
version = attr: artellapipe.dccs.maya.__version__.__version__
license = MIT
license_file = LICENSE
author = Tomas Poveda
author_email = tpovedatd@gmail.com
url = https://github.com/ArtellaPipe/artellapipe-libs-maya
url = https://github.com/ArtellaPipe/artellapipe-dccs-maya

[options]
zip_safe = false
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from setuptools import setup

from artellapipe.libs.maya import __version__
from artellapipe.dccs.maya import __version__

setup()
4 changes: 2 additions & 2 deletions tests/test_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# -*- coding: utf-8 -*-

"""
Module that contains general tests for artellapipe
Module that contains general tests for artellapipe-libs-maya
"""

import pytest

from artellapipe.libs.maya import __version__
from artellapipe.dccs.maya import __version__


def test_version():
Expand Down

0 comments on commit 1e32068

Please sign in to comment.