diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-28 10:59:30 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-28 10:59:30 -0400 |
| commit | 8fa97c02b5f07f896e52d9bb272128f267af04ea (patch) | |
| tree | e0ce6bbaaa48441ebcfb807a45e8753fe8432423 /pkg/utils.py | |
| parent | d272a953a01f5c601e4894a916f7b4d990a03327 (diff) | |
| parent | ccecd1b3750bd10404511c33be1aaca82631a502 (diff) | |
Merge tag '0.4.2' into debian/experimental
Tag leap.common version 0.4.2
Conflicts:
pkg/requirements-testing.pip
setup.cfg
src/leap/common/_version.py
src/leap/common/events/events_pb2.py
Diffstat (limited to 'pkg/utils.py')
| -rw-r--r-- | pkg/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/utils.py b/pkg/utils.py index deace14..521cd4e 100644 --- a/pkg/utils.py +++ b/pkg/utils.py @@ -58,9 +58,9 @@ def parse_requirements(reqfiles=['requirements.txt', if re.match(r'\s*-e\s+', line): pass # do not try to do anything with externals on vcs - #requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1', - #line)) - # http://foo.bar/baz/foobar/zipball/master#egg=foobar + # requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1', + # line)) + # http://foo.bar/baz/foobar/zipball/master#egg=foobar elif re.match(r'\s*https?:', line): requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', r'\1', line)) |