Skip to content

Commit

Permalink
Fix postgen
Browse files Browse the repository at this point in the history
  • Loading branch information
olegpidsadnyi committed Sep 21, 2015
1 parent 968d63d commit 12feec3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

1.1.4
-----

- fixed post-generation dependencies handling (olegpidsadnyi)


1.1.3
-----

Expand Down
2 changes: 1 addition & 1 deletion pytest_factoryboy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""pytest-factoryboy public API."""
from .fixture import register, LazyFixture

__version__ = '1.1.3'
__version__ = '1.1.4'


__all__ = [
Expand Down
15 changes: 6 additions & 9 deletions pytest_factoryboy/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@ def defer(self, function):

def evaluate(self, names=None):
"""Finalize, run deferred post-generation actions, etc."""
if names:
functions = dict((function.__name__, function) for function in self.deferred if function.__name__ in names)
deferred = [functions[name] for name in names if functions.get(name)]
else:
deferred = list(self.deferred)

for function in deferred:
function()
self.deferred.remove(function)
names = names if names is not None else [f.__name__ for f in self.deferred]
for name in names:
function = next((function for function in self.deferred if function.__name__ == name), None)
if function:
function()
self.deferred.remove(function)


@pytest.fixture
Expand Down

0 comments on commit 12feec3

Please sign in to comment.