wassname/catalyst
1
0
Fork 0
mirror of https://github.com/wassname/catalyst.git synced 2026-08-02 12:30:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

MAINT: De-dupe regex usage

Browse Source
This commit is contained in:
Richard Frank
2015-12-31 14:22:25 -05:00
parent 4dd04b5bb6
commit 6d83b06133
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup.py
+9 -9
View File
@@ -133,12 +133,14 @@ def _with_bounds(req):
return ''.join(with_bounds)
REQ_PATTERN = re.compile("([^=<>]+)([<=>]{1,2})(.*)")
def _conda_format(req):
return re.sub(
'([^=<>]+)([=<>]{1,2})',
lambda m: '%s %s' % (m.group(1).lower(), m.group(2)),
req,
1,
return REQ_PATTERN.sub(
lambda m: '%s %s%s' % (m.group(1).lower(), m.group(2), m.group(3)),
req,
1,
)
@@ -184,14 +186,12 @@ def module_requirements(requirements_path, module_names):
module_names = set(module_names)
found = set()
module_lines = []
parser = re.compile("([^=<>]+)([<=>]{1,2})(.*)")
for line in read_requirements(requirements_path, strict_bounds=True):
match = parser.match(line)
match = REQ_PATTERN.match(line)
if match is None:
raise AssertionError("Could not parse requirement: '%s'" % line)
groups = match.groups()
name = groups[0]
name = match.group(1)
if name in module_names:
found.add(name)
module_lines.append(line)