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

make hashin work as a library #31

Merged
merged 2 commits into from
Feb 27, 2017
Merged

make hashin work as a library #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0140f07
make hashin work as a library
jayfk Dec 6, 2016
ec4a64f
set the version if the requirement is unpinned
jayfk Jan 25, 2017
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
123 changes: 85 additions & 38 deletions hashin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"Consider upgrading your version of Python."
)

DEFAULT_ALGORITHM = 'sha256'

parser = argparse.ArgumentParser()
parser.add_argument(
'packages',
Expand All @@ -45,7 +47,7 @@
parser.add_argument(
'-a', '--algorithm',
help="The hash algorithm to use: one of sha256, sha384, sha512",
default='sha256'
default=DEFAULT_ALGORITHM
)
parser.add_argument(
'-v', '--verbose',
Expand Down Expand Up @@ -100,48 +102,24 @@ def run_single_package(spec, file, algorithm, python_versions=None, verbose=Fals
package, version = spec, None
# then the latest version is in the breadcrumb

data = get_package_data(package, verbose)
if not version:
version = get_latest_version(data)
assert version
if verbose:
_verbose("Latest version for", version)

# Independent of how you like to case type it, pick the correct
# name from the PyPI index.
package = data['info']['name']

try:
releases = data['releases'][version]
except KeyError:
raise PackageError('No data found for version {0}'.format(version))

if python_versions:
releases = filter_releases(releases, python_versions)

if not releases:
if python_versions:
raise PackageError(
"No releases could be found for {0} matching Python versions {1}"
.format(spec, python_versions)
)
else:
raise PackageError(
"No releases could be found for {0}"
.format(spec, python_versions)
)

add_hashes(releases, algorithm, verbose=verbose)
data = get_package_hashes(
package=package,
version=version,
verbose=verbose,
python_versions=python_versions,
algorithm=algorithm
)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seem here you're missing these lines

package = data["package"]

new_lines = ''
new_lines = '{0}=={1} \\\n'.format(package, version)
new_lines = '{0}=={1} \\\n'.format(package, data['version'])
padding = ' ' * 4
for i, release in enumerate(releases):
for i, release in enumerate(data["hashes"]):
new_lines += (
'{0}--hash={1}:{2}'
.format(padding, algorithm, release['hash'], release['url'])
.format(padding, algorithm, release['hash'])
)
if i != len(releases) - 1:
if i != len(data["hashes"]) - 1:
new_lines += ' \\'
new_lines += '\n'

Expand Down Expand Up @@ -297,7 +275,7 @@ def get_package_data(package, verbose=False):
return content


def add_hashes(releases, algorithm, verbose=False):
def get_releases_hashes(releases, algorithm, verbose=False):
for found in releases:
url = found['url']
if verbose:
Expand All @@ -317,6 +295,75 @@ def add_hashes(releases, algorithm, verbose=False):
found['hash'] = pip.commands.hash._hash_of_file(filename, algorithm)
if verbose:
_verbose(" Hash", found['hash'])
yield {
"url": url,
"hash": found["hash"]
}


def get_package_hashes(package, version=None, algorithm=DEFAULT_ALGORITHM, python_versions=(),
verbose=False):
"""
Gets the hashes for the given package.

>>> get_package_hashes('hashin')
{
"package": "hashin",
"version": "0.10",
"hashes": [
{
'url': 'https://pypi.python.org/packages/[...]',
'hash': '45d1c5d2237a3b4f78b4198709fb2ecf[...]'
},
{
'url': 'https://pypi.python.org/packages/[...]',
'hash': '0d63bf4c115154781846ecf573049324[...]'
},
{
'url': 'https://pypi.python.org/packages/[...]',
'hash': 'c32e6d9fb09dc36ab9222c4606a1f43a[...]'
}
]
}
"""
data = get_package_data(package, verbose)
if not version:
version = get_latest_version(data)
assert version
if verbose:
_verbose("Latest version for", version)

# Independent of how you like to case type it, pick the correct
# name from the PyPI index.
package = data['info']['name']

try:
releases = data['releases'][version]
except KeyError:
raise PackageError('No data found for version {0}'.format(version))

if python_versions:
releases = filter_releases(releases, python_versions)

if not releases:
if python_versions:
raise PackageError(
"No releases could be found for {0} matching Python versions {1}"
.format(version, python_versions)
)
else:
raise PackageError(
"No releases could be found for {0}".format(version, python_versions)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for python_versions here.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it was like that before. great. :)

)
return {
"package": package,
"version": version,
"hashes": list(get_releases_hashes(
releases=releases,
algorithm=algorithm,
verbose=verbose
))
}


def main():
Expand Down
63 changes: 63 additions & 0 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,3 +533,66 @@ def test_expand_python_version(self):
['2.7', 'cp27', 'py2', 'py2.7', 'py2.py3', 'source'])
self.assertEqual(sorted(hashin.expand_python_version('3.5')),
['3.5', 'cp35', 'py2.py3', 'py3', 'py3.5', 'source'])

@cleanup_tmpdir('hashin*')
@mock.patch('hashin.urlopen')
def test_as_library(self, murlopen):

def mocked_get(url, **options):
if url == "https://pypi.python.org/pypi/hashin/json":
return _Response({
'info': {
'version': '0.10',
'name': 'hashin',
},
'releases': {
'0.10': [
{
'url': 'https://pypi.python.org/packages/2.7/p/hashin/hashin-0.10-py2-none-any.whl',
},
{
'url': 'https://pypi.python.org/packages/3.3/p/hashin/hashin-0.10-py3-none-any.whl',
},
{
'url': 'https://pypi.python.org/packages/source/p/hashin/hashin-0.10.tar.gz',
}
]
}
})
elif url == "https://pypi.python.org/packages/2.7/p/hashin/hashin-0.10-py2-none-any.whl":
return _Response(b"Some py2 wheel content\n")
elif url == "https://pypi.python.org/packages/3.3/p/hashin/hashin-0.10-py3-none-any.whl":
return _Response(b"Some py3 wheel content\n")
elif url == "https://pypi.python.org/packages/source/p/hashin/hashin-0.10.tar.gz":
return _Response(b"Some tarball content\n")

raise NotImplementedError(url)

murlopen.side_effect = mocked_get

result = hashin.get_package_hashes(
package="hashin",
version="0.10",
algorithm="sha512",
)

expected = {
"package": "hashin",
"version": "0.10",
"hashes": [
{
'url': 'https://pypi.python.org/packages/2.7/p/hashin/hashin-0.10-py2-none-any.whl',
'hash': '45d1c5d2237a3b4f78b4198709fb2ecf1f781c8234ce3d94356f2100a36739433952c6c13b2843952f608949e6baa9f95055a314487cd8fb3f9d76522d8edb50'
},
{
'url': 'https://pypi.python.org/packages/3.3/p/hashin/hashin-0.10-py3-none-any.whl',
'hash': '0d63bf4c115154781846ecf573049324f06b021a1d4b92da4fae2bf491da2b83a13096b14d73e73cefad36855f4fa936bac4b2357dabf05a2b1e7329ff1e5455'
},
{
'url': 'https://pypi.python.org/packages/source/p/hashin/hashin-0.10.tar.gz',
'hash': 'c32e6d9fb09dc36ab9222c4606a1f43a2dcc183a8c64bdd9199421ef779072c174fa044b155babb12860cf000e36bc4d358694fa22420c997b1dd75b623d4daa'
}
]
}

self.assertEqual(result, expected)