Skip to content
This repository was archived by the owner on Oct 7, 2022. It is now read-only.

Add support for commit hashes in git requirements #96

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
18 changes: 13 additions & 5 deletions src/pypi2nix/stage2.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def process_wheel(wheel_cache_dir, wheel, sources, verbose, index=INDEX_URL,
release['hash_type'] = 'sha256'

if release['url'].startswith('http://') or release['url'].startswith('https://'):

release['fetch_type'] = 'fetchurl'

r = requests.get(release['url'], stream=True, timeout=None)
Expand All @@ -310,9 +310,15 @@ def process_wheel(wheel_cache_dir, wheel, sources, verbose, index=INDEX_URL,

release['hash_value'] = hash.hexdigest()
elif release['url'].startswith('git'):
revision = ''
if release['url'].startswith('git+'):
release['url'] = release['url'][4:]
if '@' in release['url']:
release['url'], revision = release['url'].split('@')
release['fetch_type'] = 'fetchgit'
command = 'nix-prefetch-git {url}'.format(
**release
command = 'nix-prefetch-git {url} {revision}'.format(
url=release['url'],
revision=revision
)
return_code, output = cmd(command, verbose != 0)
if return_code != 0:
Expand Down Expand Up @@ -365,12 +371,14 @@ def main(verbose, wheels, requirements_files, wheel_cache_dir, index=INDEX_URL):
lines = f.readlines()
for line in lines:
line = line.strip()
if line.startswith('-e '):
line = line[3:]
if line.startswith('http://') or line.startswith('https://') or \
line.startswith('-e git+'):
line.startswith('git+'):
try:
url, egg = line.split('#')
name = egg.split('egg=')[1]
sources[name] = url.replace('-e git+','')
sources[name] = url
except:
raise click.ClickException(
"Requirement starting with http:// or https:// "
Expand Down