Skip to content

Commit

Permalink
Merge pull request #166 from mottosso/master
Browse files Browse the repository at this point in the history
1.0.13
  • Loading branch information
mottosso committed Mar 19, 2015
2 parents c403257 + 8685eb3 commit 0b84e58
Show file tree
Hide file tree
Showing 8 changed files with 753 additions and 721 deletions.
9 changes: 9 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ pyblish Changelog

This contains all major version changes between pyblish releases.

Version 1.0.13
--------------

- Added pyblish.api.sort_plugins
- Added ordered output to pyblish.api.discover
- pyblish.api.plugins_by_family now yields correct results
for plug-ins with wildcard families.
- Refactored main.py into util.py

Version 1.0.12
--------------

Expand Down
55 changes: 29 additions & 26 deletions pyblish/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
plugins_by_family, plugins_by_host, instances_by_plugin)

from .plugin import Config as __Config
from .plugin import sort as sort_plugins

from .lib import log, format_filename
from .error import (
PyblishError, SelectionError, ValidationError,
Expand Down Expand Up @@ -60,40 +62,41 @@

__all__ = [
# Base objects
'Context',
'Instance',
"Context",
"Instance",

# Plug-ins
'Selector',
'Validator',
'Extractor',
'Conformer',
"Selector",
"Validator",
"Extractor",
"Conformer",

# Plug-in utilities
'discover',
'plugin_paths',
'registered_paths',
'configured_paths',
'environment_paths',
'register_plugin_path',
'deregister_plugin_path',
'deregister_all',
'plugins_by_family',
'plugins_by_host',
'instances_by_plugin',
"discover",
"plugin_paths",
"registered_paths",
"configured_paths",
"environment_paths",
"register_plugin_path",
"deregister_plugin_path",
"deregister_all",
"plugins_by_family",
"plugins_by_host",
"instances_by_plugin",
"sort_plugins",

# Configuration
'config',
"config",

# Decorators
'log',
'format_filename',
"log",
"format_filename",

# Exceptions
'PyblishError',
'SelectionError',
'ValidationError',
'ExtractionError',
'ConformError',
'NoInstancesError'
"PyblishError",
"SelectionError",
"ValidationError",
"ExtractionError",
"ConformError",
"NoInstancesError"
]
Loading

0 comments on commit 0b84e58

Please sign in to comment.