kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes to set comparisons etc

Browse Source 
Signed-off-by: Dan Ryan <dan@danryan.co>
This commit is contained in:
Dan Ryan
2018-05-18 20:57:15 -04:00
parent 406dce3496
commit 50055f7d31
6 changed files with 132 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/cli.py
+2 -1
View File
@@ -12,6 +12,7 @@ from click import (
pass_context,
Option,
version_option,
BadParameter,
)
from click_completion import init as init_completion
from click_completion import get_code
@@ -75,7 +76,7 @@ def validate_python_path(ctx, param, value):
# we'll report absolute paths which do not exist:
if isinstance(value, (str, bytes)):
if os.path.isabs(value) and not os.path.isfile(value):
raise click.BadParameter('Expected Python at path %s does not exist' % value)
raise BadParameter('Expected Python at path %s does not exist' % value)
return value
pipenv/patched/notpip/_internal/resolve.py
+5 -2
View File
@@ -36,7 +36,7 @@ class Resolver(object):
def __init__(self, preparer, session, finder, wheel_cache, use_user_site,
ignore_dependencies, ignore_installed, ignore_requires_python,
force_reinstall, isolated, upgrade_strategy):
force_reinstall, isolated, upgrade_strategy, ignore_compatibility=False):
super(Resolver, self).__init__()
assert upgrade_strategy in self._allowed_strategies
@@ -56,8 +56,11 @@ class Resolver(object):
self.ignore_dependencies = ignore_dependencies
self.ignore_installed = ignore_installed
self.ignore_requires_python = ignore_requires_python
self.ignore_compatibility = ignore_requires_python
self.ignore_compatibility = ignore_compatibility
self.use_user_site = use_user_site
self.requires_python = None
if self.ignore_compatibility:
self.ignore_requires_python = True
self._discovered_dependencies = defaultdict(list)
pipenv/patched/notpip/_vendor/packaging/specifiers.py
+31 -1
View File
@@ -586,7 +586,7 @@ def _pad_version(left, right):
)
class SpecifierSet(BaseSpecifier):
class SpecifierSet(BaseSpecifier, set):
def __init__(self, specifiers="", prereleases=None):
# Split on , to break each indidivual specifier into it's own item, and
@@ -673,6 +673,36 @@ class SpecifierSet(BaseSpecifier):
def __iter__(self):
return iter(self._specs)
def __iadd__(self, other):
if isinstance(other, string_types):
other = SpecifierSet(other)
elif not isinstance(other, SpecifierSet):
return NotImplemented
if self._prereleases is not None and other._prereleases is not None and self._prereleases != other._prereleases:
raise ValueError(
"Cannot combine SpecifierSets with True and False prerelease "
"overrides."
)
specs = set(self._specs)
specs.intersection_update(other._specs)
self._specs = frozenset(specs)
def intersection_update(self, other):
if isinstance(other, string_types):
other = SpecifierSet(other)
elif not isinstance(other, SpecifierSet):
return NotImplemented
if self._prereleases is not None and other._prereleases is not None and self._prereleases != other._prereleases:
raise ValueError(
"Cannot combine SpecifierSets with True and False prerelease "
"overrides."
)
specs = set(self._specs)
specs.intersection_update(other._specs)
self._specs = frozenset(specs)
@property
def prereleases(self):
# If we have been given an explicit prerelease modifier, then we'll
pipenv/patched/piptools/repositories/pypi.py
+3 -3
View File
@@ -333,9 +333,9 @@ class PyPIRepository(BaseRepository):
# Anything could go wrong here — can't be too careful.
except Exception:
pass
if reqset.requires_python:
marker = 'python_version=="{0}"'.format(reqset.requires_python.replace(' ', ''))
requires_python = reqset.requires_python if hasattr(reqset, 'requires_python') else self.resolver.requires_python
if requires_python:
marker = 'python_version=="{0}"'.format(requires_python.replace(' ', ''))
new_req = InstallRequirement.from_line('{0}; {1}'.format(str(ireq.req), marker))
result = [new_req]
tasks/vendoring/patches/patched/pip10.patch
+87 -9
View File
@@ -308,18 +308,47 @@ index b2b55f89..50b5e2df 100644
"""Clean up files, remove builds."""
diff --git a/pipenv/patched/pip/_internal/resolve.py b/pipenv/patched/pip/_internal/resolve.py
index 3200fca8..163606c6 100644
index 3200fca8..14e3d298 100644
--- a/pipenv/patched/pip/_internal/resolve.py
+++ b/pipenv/patched/pip/_internal/resolve.py
@@ -56,6 +56,7 @@ class Resolver(object):
@@ -14,15 +14,15 @@ import logging
from collections import defaultdict
from itertools import chain
from pip._internal.exceptions import (
BestVersionAlreadyInstalled, DistributionNotFound, HashError, HashErrors,
UnsupportedPythonVersion,
)
from pip._internal.req.req_install import InstallRequirement
from pip._internal.utils.logging import indent_log
from pip._internal.utils.misc import dist_in_usersite, ensure_dir
from pip._internal.utils.packaging import check_dist_requires_python
logger = logging.getLogger(__name__)
@@ -36,7 +36,7 @@ class Resolver(object):
def __init__(self, preparer, session, finder, wheel_cache, use_user_site,
ignore_dependencies, ignore_installed, ignore_requires_python,
- force_reinstall, isolated, upgrade_strategy):
+ force_reinstall, isolated, upgrade_strategy, ignore_compatibility=False):
super(Resolver, self).__init__()
assert upgrade_strategy in self._allowed_strategies
@@ -56,7 +56,11 @@ class Resolver(object):
self.ignore_dependencies = ignore_dependencies
self.ignore_installed = ignore_installed
self.ignore_requires_python = ignore_requires_python
+ self.ignore_compatibility = ignore_requires_python
+ self.ignore_compatibility = ignore_compatibility
self.use_user_site = use_user_site
+ self.requires_python = None
+ if self.ignore_compatibility:
+ self.ignore_requires_python = True
self._discovered_dependencies = defaultdict(list)
@@ -238,7 +239,7 @@ class Resolver(object):
@@ -238,7 +242,7 @@ class Resolver(object):
return abstract_dist
@@ -328,7 +357,7 @@ index 3200fca8..163606c6 100644
"""Prepare a single requirements file.
:return: A list of additional InstallRequirements to also install.
@@ -246,6 +247,9 @@ class Resolver(object):
@@ -246,6 +250,9 @@ class Resolver(object):
# Tell user what we are doing for this requirement:
# obtain (editable), skipping, processing (local url), collecting
# (remote url or package name)
@@ -338,7 +367,7 @@ index 3200fca8..163606c6 100644
if req_to_install.constraint or req_to_install.prepared:
return []
@@ -261,11 +265,17 @@ class Resolver(object):
@@ -261,11 +268,17 @@ class Resolver(object):
try:
check_dist_requires_python(dist)
except UnsupportedPythonVersion as err:
@@ -357,7 +386,7 @@ index 3200fca8..163606c6 100644
more_reqs = []
def add_req(subreq, extras_requested):
@@ -291,10 +301,14 @@ class Resolver(object):
@@ -291,10 +304,14 @@ class Resolver(object):
# We add req_to_install before its dependencies, so that we
# can refer to it when adding dependencies.
if not requirement_set.has_requirement(req_to_install.name):
@@ -372,7 +401,7 @@ index 3200fca8..163606c6 100644
)
if not self.ignore_dependencies:
@@ -318,6 +332,19 @@ class Resolver(object):
@@ -318,6 +335,19 @@ class Resolver(object):
for subreq in dist.requires(available_requested):
add_req(subreq, extras_requested=available_requested)
@@ -392,7 +421,6 @@ index 3200fca8..163606c6 100644
if not req_to_install.editable and not req_to_install.satisfied_by:
# XXX: --no-install leads this to report 'Successfully
# downloaded' for only non-editable reqs, even though we took
diff --git a/pipenv/patched/pip/_internal/utils/misc.py b/pipenv/patched/pip/_internal/utils/misc.py
index 9d4c9b16..d0c8e437 100644
--- a/pipenv/patched/pip/_internal/utils/misc.py
@@ -460,6 +488,56 @@ index 5f9bb93d..83edd874 100644
logger.warning(
"Package %s has an invalid Requires-Python entry %s - %s",
diff --git a/pipenv/patched/pip/_vendor/packaging/specifiers.py b/pipenv/patched/pip/_vendor/packaging/specifiers.py
index 9b6353f0..2281ad8e 100644
--- a/pipenv/patched/pip/_vendor/packaging/specifiers.py
+++ b/pipenv/patched/pip/_vendor/packaging/specifiers.py
@@ -586,7 +586,7 @@ def _pad_version(left, right):
)
-class SpecifierSet(BaseSpecifier):
+class SpecifierSet(BaseSpecifier, set):
def __init__(self, specifiers="", prereleases=None):
# Split on , to break each indidivual specifier into it's own item, and
@@ -673,6 +673,36 @@ class SpecifierSet(BaseSpecifier):
def __iter__(self):
return iter(self._specs)
+ def __iadd__(self, other):
+ if isinstance(other, string_types):
+ other = SpecifierSet(other)
+ elif not isinstance(other, SpecifierSet):
+ return NotImplemented
+
+ if self._prereleases is not None and other._prereleases is not None and self._prereleases != other._prereleases:
+ raise ValueError(
+ "Cannot combine SpecifierSets with True and False prerelease "
+ "overrides."
+ )
+ specs = set(self._specs)
+ specs.intersection_update(other._specs)
+ self._specs = frozenset(specs)
+
+ def intersection_update(self, other):
+ if isinstance(other, string_types):
+ other = SpecifierSet(other)
+ elif not isinstance(other, SpecifierSet):
+ return NotImplemented
+
+ if self._prereleases is not None and other._prereleases is not None and self._prereleases != other._prereleases:
+ raise ValueError(
+ "Cannot combine SpecifierSets with True and False prerelease "
+ "overrides."
+ )
+ specs = set(self._specs)
+ specs.intersection_update(other._specs)
+ self._specs = frozenset(specs)
+
@property
def prereleases(self):
# If we have been given an explicit prerelease modifier, then we'll
diff --git a/pipenv/patched/pip/_internal/wheel.py b/pipenv/patched/pip/_internal/wheel.py
index c71f17d2..3e29a49d 100644
--- a/pipenv/patched/pip/_internal/wheel.py
tasks/vendoring/patches/patched/piptools.patch
+4 -4
View File
@@ -19,7 +19,7 @@ index 4e6174c..75f9b49 100644
# NOTE
# We used to store the cache dir under ~/.pip-tools, which is not the
diff --git a/pipenv/patched/piptools/repositories/pypi.py b/pipenv/patched/piptools/repositories/pypi.py
index 1c4b943..631a16c 100644
index 1c4b943..e412a1f 100644
--- a/pipenv/patched/piptools/repositories/pypi.py
+++ b/pipenv/patched/piptools/repositories/pypi.py
@@ -15,10 +15,16 @@ from .._compat import (
@@ -270,9 +270,9 @@ index 1c4b943..631a16c 100644
+ # Anything could go wrong here — can't be too careful.
+ except Exception:
+ pass
+
+ if reqset.requires_python:
+ marker = 'python_version=="{0}"'.format(reqset.requires_python.replace(' ', ''))
+ requires_python = reqset.requires_python if hasattr(reqset, 'requires_python') else self.resolver.requires_python
+ if requires_python:
+ marker = 'python_version=="{0}"'.format(requires_python.replace(' ', ''))
+ new_req = InstallRequirement.from_line('{0}; {1}'.format(str(ireq.req), marker))
+ result = [new_req]
+