You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ro...@apache.org on 2016/07/14 17:21:37 UTC
[1/2] incubator-beam git commit: Temporarily reverting pickler
changes (@4e2d8ab).
Repository: incubator-beam
Updated Branches:
refs/heads/python-sdk 2b9d81fcc -> 7c0c27ac0
Temporarily reverting pickler changes (@4e2d8ab).
It is causing infinite recursion when some tests are directly
invoked outside the testing framework.
Added one such test to tox tests for testing failing case
(directly by main function).
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/245facdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/245facdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/245facdb
Branch: refs/heads/python-sdk
Commit: 245facdbc166298cdb96521165a7514653fa8e57
Parents: 2b9d81f
Author: Ahmet Altay <al...@google.com>
Authored: Wed Jul 13 10:18:03 2016 -0700
Committer: Robert Bradshaw <ro...@google.com>
Committed: Thu Jul 14 10:20:29 2016 -0700
----------------------------------------------------------------------
sdks/python/apache_beam/internal/pickler.py | 18 ------------------
sdks/python/tox.ini | 1 +
2 files changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/245facdb/sdks/python/apache_beam/internal/pickler.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/pickler.py b/sdks/python/apache_beam/internal/pickler.py
index f427aa5..898e04b 100644
--- a/sdks/python/apache_beam/internal/pickler.py
+++ b/sdks/python/apache_beam/internal/pickler.py
@@ -159,24 +159,6 @@ if 'save_module' in dir(dill.dill):
return old_save_module_dict(pickler, obj)
dill.dill.save_module_dict = new_save_module_dict
-
- old_save_function = dill.dill.save_function
-
- @dill.dill.register(types.FunctionType)
- def new_save_function(pickler, obj):
- globs = obj.__globals__ if dill.dill.PY3 else obj.func_globals
- if (dill.dill.is_dill(pickler) and globs == pickler._main.__dict__
- and not pickler._recurse):
- try:
- pickler._recurse = True
- return old_save_function(pickler, obj)
- finally:
- pickler._recurse = False
- else:
- return old_save_function(pickler, obj)
- dill.dill.save_function = new_save_function
-
-
def _nest_dill_logging():
"""Prefix all dill logging with its depth in the callstack.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/245facdb/sdks/python/tox.ini
----------------------------------------------------------------------
diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
index 29674ed..5a2572e 100644
--- a/sdks/python/tox.ini
+++ b/sdks/python/tox.ini
@@ -31,6 +31,7 @@ deps=
pep8
pylint
commands =
+ python apache_beam/examples/complete/autocomplete_test.py
python setup.py test
{toxinidir}/run_pylint.sh
passenv = TRAVIS*
[2/2] incubator-beam git commit: Closes #645
Posted by ro...@apache.org.
Closes #645
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7c0c27ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7c0c27ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7c0c27ac
Branch: refs/heads/python-sdk
Commit: 7c0c27ac00fd0ab6b8c2b982540e644485efc60e
Parents: 2b9d81f 245facd
Author: Robert Bradshaw <ro...@google.com>
Authored: Thu Jul 14 10:20:59 2016 -0700
Committer: Robert Bradshaw <ro...@google.com>
Committed: Thu Jul 14 10:20:59 2016 -0700
----------------------------------------------------------------------
sdks/python/apache_beam/internal/pickler.py | 18 ------------------
sdks/python/tox.ini | 1 +
2 files changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------