diff --git a/HISTORY.txt b/HISTORY.txt index 2dc0aa6b..2b997774 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,3 +1,5 @@ +11.10.3: + - Bugfix release (break dependency on pathlib2). 11.10.2: - Backport NamedTemporaryFile for python 2. - Implement atomic lockfile writing / rewriting. diff --git a/pipenv/__version__.py b/pipenv/__version__.py index 875327b9..1a58249a 100644 --- a/pipenv/__version__.py +++ b/pipenv/__version__.py @@ -2,4 +2,4 @@ # // ) ) / / // ) ) //___) ) // ) ) || / / # //___/ / / / //___/ / // // / / || / / # // / / // ((____ // / / ||/ / -__version__ = '11.10.2' +__version__ = '11.10.3' diff --git a/pipenv/patched/pew/_utils.py b/pipenv/patched/pew/_utils.py index c45c37e0..a45c227f 100644 --- a/pipenv/patched/pew/_utils.py +++ b/pipenv/patched/pew/_utils.py @@ -9,7 +9,7 @@ from functools import partial, wraps try: from pathlib import Path except ImportError: - from pathlib2 import Path + from pipenv.vendor.pathlib2 import Path from tempfile import NamedTemporaryFile as _ntf try: from shutil import which diff --git a/pipenv/patched/pew/pew.py b/pipenv/patched/pew/pew.py index 960a1263..2d3889a0 100644 --- a/pipenv/patched/pew/pew.py +++ b/pipenv/patched/pew/pew.py @@ -11,7 +11,7 @@ from subprocess import CalledProcessError try: from pathlib import Path except ImportError: - from pathlib2 import Path + from pipenv.vendor.pathlib2 import Path try: from shutil import get_terminal_size diff --git a/setup.py b/setup.py index 5fcecb66..8dc09a32 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,6 @@ required = [ 'setuptools>=36.2.1', 'virtualenv-clone>=0.2.5', 'virtualenv', - 'pathlib2;python_version<"3.4"', 'requests[security];python_version<"2.7"', 'ordereddict;python_version<"2.7"', ] diff --git a/tasks/vendoring/patches/patched/pew.patch b/tasks/vendoring/patches/patched/pew.patch index 27513fe3..e6e5f737 100644 --- a/tasks/vendoring/patches/patched/pew.patch +++ b/tasks/vendoring/patches/patched/pew.patch @@ -23,7 +23,7 @@ index d1d8e0a..c45c37e 100644 +try: + from pathlib import Path +except ImportError: -+ from pathlib2 import Path ++ from pipenv.vendor.pathlib2 import Path from tempfile import NamedTemporaryFile as _ntf try: from shutil import which @@ -39,7 +39,7 @@ index bcaabad..b8fc3e7 100644 +try: + from pathlib import Path +except ImportError: -+ from pathlib2 import Path ++ from pipenv.vendor.pathlib2 import Path try: from shutil import get_terminal_size