Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vendored deps #2368

Merged
merged 5 commits into from
Jun 17, 2018
Merged

Update vendored deps #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69f75e9
Fix pep425 vendoring patch
techalchemy Jun 16, 2018
9d9824c
Update all vendored and patched libraries
techalchemy Jun 16, 2018
6fafc24
fix patch
techalchemy Jun 16, 2018
9f7ccc7
Fix lockfile
techalchemy Jun 16, 2018
040ae11
Update scandir to avoid importing from system lib
techalchemy Jun 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ pytest-pypy = {path = "./tests/pytest-pypi", editable = true}
pytest-tap = "*"
flaky = "*"
stdeb = {version="*", markers="sys_platform == 'linux'"}
white = {version="*", markers="python_version >= '3.6'"}
black = {version="*", markers="python_version >= '3.6'"}
pytz = "*"
towncrier = "*"

[packages]

Expand Down
185 changes: 116 additions & 69 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pipenv/patched/piptools/_compat/pip_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def do_import(module_path, subimport=None, old_path=None, vendored_name=None):
if subimport:
return getattr(_tmp, subimport, _tmp)
return _tmp


InstallRequirement = do_import('req.req_install', 'InstallRequirement', vendored_name='notpip')
parse_requirements = do_import('req.req_file', 'parse_requirements', vendored_name='notpip')
Expand Down
16 changes: 8 additions & 8 deletions pipenv/patched/piptools/repositories/pypi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
InstallationError,
)

from notpip._vendor.packaging.requirements import InvalidRequirement, Requirement
from notpip._vendor.packaging.version import Version, InvalidVersion, parse as parse_version
from notpip._vendor.packaging.specifiers import SpecifierSet
from notpip._vendor.pyparsing import ParseException
from pipenv.patched.notpip._vendor.packaging.requirements import InvalidRequirement, Requirement
from pipenv.patched.notpip._vendor.packaging.version import Version, InvalidVersion, parse as parse_version
from pipenv.patched.notpip._vendor.packaging.specifiers import SpecifierSet
from pipenv.patched.notpip._vendor.pyparsing import ParseException

from ..cache import CACHE_DIR
from pipenv.environments import PIPENV_CACHE_DIR
Expand All @@ -37,15 +37,15 @@


try:
from notpip._internal.operations.prepare import RequirementPreparer
from notpip._internal.resolve import Resolver as PipResolver
from pipenv.patched.notpip._internal.operations.prepare import RequirementPreparer
from pipenv.patched.notpip._internal.resolve import Resolver as PipResolver
except ImportError:
pass

try:
from notpip._internal.cache import WheelCache
from pipenv.patched.notpip._internal.cache import WheelCache
except ImportError:
from notpip.wheel import WheelCache
from pipenv.patched.notpip.wheel import WheelCache


class HashCache(SafeFileCache):
Expand Down
4 changes: 2 additions & 2 deletions pipenv/patched/piptools/resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import os

from first import first
from notpip._vendor.packaging.markers import default_environment
from pipenv.patched.notpip._vendor.packaging.markers import default_environment
from ._compat import InstallRequirement

from . import click
Expand Down Expand Up @@ -314,7 +314,7 @@ def _iter_dependencies(self, ireq):
dependency_strings = self.dependency_cache[ireq]
log.debug(' {:25} requires {}'.format(format_requirement(ireq),
', '.join(sorted(dependency_strings, key=lambda s: s.lower())) or '-'))
from notpip._vendor.packaging.markers import InvalidMarker
from pipenv.patched.notpip._vendor.packaging.markers import InvalidMarker
for dependency_string in dependency_strings:
try:
_dependency_string = dependency_string
Expand Down
Loading