Skip to content

Commit

Permalink
Merge pull request #17 from mottosso/master
Browse files Browse the repository at this point in the history
Updated for Pyblish Endpoint 1.0.2
  • Loading branch information
mottosso committed Dec 2, 2014
2 parents 1a527ea + 942a622 commit 51f3ff8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ pyblish-maya Changelog

This contains all major version changes between pyblish-maya releases.

Version 1.0.5
-------------

Updated for Pyblish Endpoint 1.0.2

Version 1.0.3
-------------

Expand Down
13 changes: 6 additions & 7 deletions pyblish_maya/service.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@

# Dependencies
import pyblish_endpoint.service
from version import version

from maya import utils


# def from_main_thread(func):
# """Decorator to make `func` execute from main thread"""
# def wrapper(*args, **kwargs):
# return utils.executeInMainThreadWithResult(func, *args, **kwargs)
# return wrapper


class MayaService(pyblish_endpoint.service.EndpointService):
def init(self, *args, **kwargs):
return utils.executeInMainThreadWithResult(
Expand All @@ -20,3 +14,8 @@ def init(self, *args, **kwargs):
def process(self, *args, **kwargs):
return utils.executeInMainThreadWithResult(
super(MayaService, self).process, *args, **kwargs)

def versions(self):
versions = super(MayaService, self).versions()
versions["pyblish-maya"] = version
return versions
2 changes: 1 addition & 1 deletion pyblish_maya/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

VERSION_MAJOR = 1
VERSION_MINOR = 0
VERSION_PATCH = 4
VERSION_PATCH = 5

version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
version = '%i.%i.%i' % version_info
Expand Down

0 comments on commit 51f3ff8

Please sign in to comment.