Skip to content

Commit

Permalink
Merge pull request #142 from wickman/wickman/141
Browse files Browse the repository at this point in the history
Address #141.  Update version.py to reflect 1.0.2.dev0.
  • Loading branch information
wickman committed Aug 4, 2015
2 parents 7654a4c + f6c1c26 commit c74d9f2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
8 changes: 8 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ CHANGES
not explicitly set in the environment.
Fixes `#135 <https://github.com/pantsbuild/pex/issues/135>`_.

* Bug fix: Since `69649c1 <https://github.com/pantsbuild/pex/commit/69649c1>`_ we have been unpatching
the side-effects of ``sys.modules`` after ``PEX.execute``. This takes all modules imported during
the PEX lifecycle and sets all their attributes to ``None``. Unfortunately, ``sys.excepthook``,
``atexit`` and ``__del__`` may still try to operate using these tainted modules, causing exceptions
on interpreter teardown. This reverts just the ``sys`` unpatching so that the abovementioned
teardown hooks behave more predictably.
Fixes `#141 <https://github.com/pantsbuild/pex/issues/141>`_.

-----
1.0.1
-----
Expand Down
6 changes: 1 addition & 5 deletions pex/pex.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,7 @@ def patch_all(path, path_importer_cache, modules):
new_sys_path, new_sys_path_importer_cache, new_sys_modules = cls.minimum_sys()

patch_all(new_sys_path, new_sys_path_importer_cache, new_sys_modules)

try:
yield
finally:
patch_all(old_sys_path, old_sys_path_importer_cache, old_sys_modules)
yield

def _wrap_coverage(self, runner, *args):
if not self._vars.PEX_COVERAGE and self._vars.PEX_COVERAGE_FILENAME is None:
Expand Down
2 changes: 1 addition & 1 deletion pex/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).

__version__ = '1.0.1'
__version__ = '1.0.2.dev0'

SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<16'
WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.25.0'

0 comments on commit c74d9f2

Please sign in to comment.