Skip to content

Commit

Permalink
Adding to PyPI
Browse files Browse the repository at this point in the history
  • Loading branch information
mottosso committed Sep 30, 2014
1 parent 5697438 commit 247a053
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 9 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,11 @@ python:
- 2.7
script:
- pip install git+git://github.com/pyblish/pyblish-napoleon.git
deploy:
provider: pypi
user: mottosso
password:
secure: L/n6HnPaidCRHBnKDzGMFJrI5oRYfj9EZt0LJ6qUN3GGBgUM1QNIyiWUJrx0WI0Rikrzn2tZ8b18WjJl5vSY/wHmzltG3Q+MK8pSZSUd0dT4dmzHpHWx0Vqj65BEI6Z8wLZOuUWJNyNFGjFss9LMOtcNJJYB1bbcOny9uJo0mro=
on:
tags: true
all_branches: true
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion napoleon/plugins/conform_asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def process_instance(self, instance):

# Locate asset in which the commit is stored
parent_asset_dir = cquery.first_match(commit_dir,
selector='Asset',
selector='.Asset',
direction=cquery.UP)
if not parent_asset_dir:
self.log.warning("Could not locate parent "
Expand Down
14 changes: 7 additions & 7 deletions napoleon/plugins/conform_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ class NapoleonConformCache(napoleon.plugin.Conformer):
def process_instance(self, instance):
commit_dir = instance.data('commit_dir')
if not commit_dir:
self.log.warning("Cannot conform what hasn't "
"been committed: \"%s\"" % instance)
return
raise pyblish.api.ConformError(
"Cannot conform what hasn't "
"been committed: \"%s\"" % instance)

parent_asset_dir = cquery.first_match(commit_dir,
selector='Shot',
selector='.Shot',
direction=cquery.UP)
if not parent_asset_dir:
self.log.warning("Could not locate parent "
"shot of commit: %s" % commit_dir)
return
raise pyblish.api.ConformError(
"Could not locate parent "
"shot of commit: %s" % commit_dir)

self.log.info("Parent shot: %s" % parent_asset_dir)
public_dir = napoleon.pipeline.public_dir(parent_asset_dir)
Expand Down
2 changes: 1 addition & 1 deletion napoleon/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

VERSION_MAJOR = 0
VERSION_MINOR = 1
VERSION_PATCH = 0
VERSION_PATCH = 1

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

0 comments on commit 247a053

Please sign in to comment.