diff --git a/tasks/__init__.py b/tasks/__init__.py index 04581bb3..63fe1388 100644 --- a/tasks/__init__.py +++ b/tasks/__init__.py @@ -1,14 +1,16 @@ # -*- coding=utf-8 -*- -# Copyied from pip's vendoring process +# Copied from pip's vendoring process # see https://github.com/pypa/pip/blob/95bcf8c5f6394298035a7332c441868f3b0169f4/tasks/__init__.py -import invoke import re -from . import vendoring, release -from .vendoring import vendor_passa from pathlib import Path +import invoke + +from . import release, vendoring +from .vendoring import vendor_passa + + ROOT = Path(".").parent.parent.absolute() - ns = invoke.Collection(vendoring, release, release.clean_mdchangelog, vendor_passa.vendor_passa) diff --git a/tasks/release.py b/tasks/release.py index 030f1832..7c2e7aba 100644 --- a/tasks/release.py +++ b/tasks/release.py @@ -1,7 +1,7 @@ # -*- coding=utf-8 -*- import datetime -import pathlib import os +import pathlib import re import sys diff --git a/tasks/vendoring/__init__.py b/tasks/vendoring/__init__.py index 0ec59b8e..c9757965 100644 --- a/tasks/vendoring/__init__.py +++ b/tasks/vendoring/__init__.py @@ -1,23 +1,29 @@ # -*- coding=utf-8 -*- -""""Vendoring script, python 3.5 needed""" # Taken from pip # see https://github.com/pypa/pip/blob/95bcf8c5f6394298035a7332c441868f3b0169f4/tasks/vendoring/__init__.py -from pipenv.vendor.vistir.compat import NamedTemporaryFile, TemporaryDirectory -from pipenv.vendor.vistir.contextmanagers import open_file -from pathlib import Path -from pipenv.utils import mkdir_p +""""Vendoring script, python 3.5 needed""" + import io -from urllib3.util import parse_url as urllib3_parse -import bs4 -# from tempfile import TemporaryDirectory -import tarfile -import zipfile import re import shutil import sys +# from tempfile import TemporaryDirectory +import tarfile +import zipfile + +from pathlib import Path + +import bs4 import invoke import requests +from urllib3.util import parse_url as urllib3_parse + +from pipenv.utils import mkdir_p +from pipenv.vendor.vistir.compat import NamedTemporaryFile, TemporaryDirectory +from pipenv.vendor.vistir.contextmanagers import open_file + + TASK_NAME = 'update' LIBRARY_DIRNAMES = { diff --git a/tasks/vendoring/vendor_passa.py b/tasks/vendoring/vendor_passa.py index ad179a10..f2c58745 100644 --- a/tasks/vendoring/vendor_passa.py +++ b/tasks/vendoring/vendor_passa.py @@ -1,6 +1,6 @@ -from pipenv._compat import TemporaryDirectory import invoke +from pipenv._compat import TemporaryDirectory from . import _get_git_root, _get_vendor_dir, log