diff --git a/attract/attrs_extra.py b/attract/attrs_extra.py deleted file mode 100644 index cec464a..0000000 --- a/attract/attrs_extra.py +++ /dev/null @@ -1,17 +0,0 @@ -"""Extra functionality for attrs.""" - -import logging - -import attr - - -def log(name): - """Returns a logger attr.ib - - :param name: name to pass to logging.getLogger() - :rtype: attr.ib - """ - return attr.ib(default=logging.getLogger(name), - repr=False, - hash=False, - cmp=False) diff --git a/attract/shots/__init__.py b/attract/shots/__init__.py index 47e1d90..8d9fbc1 100644 --- a/attract/shots/__init__.py +++ b/attract/shots/__init__.py @@ -13,8 +13,8 @@ import pillarsdk import pillar.api.utils from pillar.web.system_util import pillar_api from pillar.api.nodes.custom import register_patch_handler +from pillar import attrs_extra -from attract import attrs_extra from attract.node_types import node_type_shot, node_type_task # From patch operation name to fields that operation may edit. diff --git a/attract/subversion.py b/attract/subversion.py index 6284fc6..b7493fd 100644 --- a/attract/subversion.py +++ b/attract/subversion.py @@ -8,8 +8,7 @@ import attr import blinker import svn.remote import svn.common - -from . import attrs_extra +from pillar import attrs_extra task_logged = blinker.NamedSignal('task_logged') task_marker_re = re.compile(r'\[(?PT\d+)\]') diff --git a/attract/tasks/__init__.py b/attract/tasks/__init__.py index e9e69a4..0ac37c9 100644 --- a/attract/tasks/__init__.py +++ b/attract/tasks/__init__.py @@ -4,9 +4,9 @@ import attr import flask_login import pillarsdk +from pillar import attrs_extra from pillar.web.system_util import pillar_api -from attract import attrs_extra from attract.node_types.task import node_type_task diff --git a/requirements.txt b/requirements.txt index e62c003..30585f6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Primary requirements: #pillar -attrs==16.1.0 +attrs==16.2.0 # Use Sybren's branch, until this pull request is merged: # https://github.com/dsoprea/PySvn/pull/43 -e git+https://github.com/sybrenstuvel/PySvn.git@sybren-svncommanderror#egg=svn