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

Jump to bottom

Fix grouping of extras requirements in notpip #2142

Merged
merged 14 commits into from
May 23, 2018
Merged

Fix grouping of extras requirements in notpip #2142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b3f6454
Fix grouping of extras requirements in notpip
altendky May 4, 2018
41ab9ba
Merge branch 'master' into 2138-notpip_looping
altendky May 4, 2018
b53a365
Modify existing patch to include this modification
altendky May 5, 2018
2d3db30
Merge branch 'master' into 2138-notpip_looping
altendky May 6, 2018
2bbdd92
Merge branch 'master' into 2138-notpip_looping
altendky May 9, 2018
c392edf
Merge branch 'master' into 2138-notpip_looping
altendky May 10, 2018
65f37ab
Merge branch 'master' into 2138-notpip_looping
altendky May 11, 2018
58aa9b7
Merge branch 'master' into 2138-notpip_looping
altendky May 14, 2018
4ac1080
Merge branch 'master' into 2138-notpip_looping
altendky May 16, 2018
1eb56b4
@classmethod PackageFinder.get_extras_links() until it moves
altendky May 17, 2018
3b7929d
Add a few test cases for PackageFinder.get_extras_links()
altendky May 17, 2018
dcbbe91
Merge branch 'master' into 2138-notpip_looping
altendky May 17, 2018
4f92007
Merge branch 'master' into 2138-notpip_looping
altendky May 18, 2018
81b1d91
Merge branch 'master' into 2138-notpip_looping
altendky May 21, 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
20 changes: 8 additions & 12 deletions pipenv/patched/notpip/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,30 +206,26 @@ def add_dependency_links(self, links):
)
self.dependency_links.extend(links)

def get_extras_links(self, links):
@staticmethod
def get_extras_links(links):
requires = []
extras = {}

current_section = None
current_list = requires

for link in links:
if not link:
current_section = None

if not current_section:
if not (link.startswith('[')):
requires.append(link)
else:
current_section = link[1:-1]
extras[current_section] = []
current_list = requires
if link.startswith('['):
current_list = []
extras[link[1:-1]] = current_list
else:
extras[current_section].append(link)
current_list.append(link)

return extras




@staticmethod
def _sort_locations(locations, expand_dir=False):
"""
Expand Down
22 changes: 11 additions & 11 deletions tasks/vendoring/patches/patched/pip.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,29 +1362,29 @@ index f653f6e..48aaa35 100644
)
self.dependency_links.extend(links)

+ def get_extras_links(self, links):
+ @classmethod
+ def get_extras_links(links):
+ requires = []
+ extras = {}
+
+ current_section = None
+ current_list = requires
+
+ for link in links:
+ if not link:
+ current_section = None
+
+ if not current_section:
+ if not (link.startswith('[')):
+ requires.append(link)
+ else:
+ current_section = link[1:-1]
+ extras[current_section] = []
+ current_list = requires
+ if link.startswith('['):
+ current_list = []
+ extras[link[1:-1]] = current_list
+ else:
+ extras[current_section].append(link)
+ current_list.append(link)
+
+ return extras
+
+
+
+
+
+
+
@staticmethod
def _sort_locations(locations, expand_dir=False):
Expand Down
131 changes: 131 additions & 0 deletions tests/unit/test_patched.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
from __future__ import absolute_import

import pytest

from notpip.index import PackageFinder


get_extras_links_scenarios = {
'windows and not windows': (
[
'chardet',
'[:platform_system != "windows"]',
'twisted',
'[:platform_system == "windows"]',
'twisted[windows_platform]',
],
{
':platform_system != "windows"': [
'twisted',
],
':platform_system == "windows"': [
'twisted[windows_platform]',
],
},
),
'requests': (
[
'chardet<3.1.0,>=3.0.2',
'idna<2.7,>=2.5',
'urllib3<1.23,>=1.21.1',
'certifi>=2017.4.17',
'[security]',
'pyOpenSSL>=0.14',
'cryptography>=1.3.4',
'idna>=2.0.0',
'[socks]',
'PySocks!=1.5.7,>=1.5.6',
(
'[socks:sys_platform == "win32"'
' and (python_version == "2.7" or python_version == "2.6")]'
),
'win_inet_pton',
],
{
'security': [
'pyOpenSSL>=0.14',
'cryptography>=1.3.4',
'idna>=2.0.0',
],
'socks': [
'PySocks!=1.5.7,>=1.5.6',
],
'socks:sys_platform == "win32" '
'and (python_version == "2.7" or python_version == "2.6")': [
'win_inet_pton',
],
}
),
'attrs': (
[
'[dev]',
'coverage',
'hypothesis',
'pympler',
'pytest',
'six',
'zope.interface',
'sphinx',
'zope.interface',
'[docs]',
'sphinx',
'zope.interface',
'[tests]',
'coverage',
'hypothesis',
'pympler',
'pytest',
'six',
'zope.interface',
],
{
'dev': [
'coverage',
'hypothesis',
'pympler',
'pytest',
'six',
'zope.interface',
'sphinx',
'zope.interface',
],
'docs': [
'sphinx',
'zope.interface',
],
'tests': [
'coverage',
'hypothesis',
'pympler',
'pytest',
'six',
'zope.interface',
],
},
),
'misc': (
[
'chardet',
'[:platform_system != "windows"]',
'attrs',
'[:platform_system == "windows"]',
'pytz',
],
{
':platform_system != "windows"': [
'attrs',
],
':platform_system == "windows"': [
'pytz',
],
},
),
}

@pytest.mark.parametrize(
'scenarios,expected',
list(get_extras_links_scenarios.values()),
ids=list(get_extras_links_scenarios.keys()),
)
def test_get_extras_links(scenarios, expected):
assert PackageFinder.get_extras_links(scenarios) == expected