summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-01-12 15:40:47 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-01-13 15:40:03 +0000
commitdfd8ab146d790ad582b3da8d417735d5134903eb (patch)
treefe869416bae50918688efd6d207493aedd753f0e
parent48de25fab7a0d88c1acf0a2a93ff1e98662c8ad1 (diff)
downloadimport-dfd8ab146d790ad582b3da8d417735d5134903eb.tar.gz
Move get_releases into common and make all extensions use it
We also call package_releases with True, so that we also get versions of releases that have been hidden. pip is willing to install from hidden releases so we should too, the concept of hidden releases will eventually disappear from pypi as well.
-rw-r--r--baserockimport/exts/importer_python_common.py11
-rwxr-xr-xbaserockimport/exts/python.find_deps2
2 files changed, 11 insertions, 2 deletions
diff --git a/baserockimport/exts/importer_python_common.py b/baserockimport/exts/importer_python_common.py
index 6c8fc66..eedc81b 100644
--- a/baserockimport/exts/importer_python_common.py
+++ b/baserockimport/exts/importer_python_common.py
@@ -23,6 +23,15 @@ from importer_base import ImportExtension
PYPI_URL = 'http://pypi.python.org/pypi'
+def get_releases(client, package_name):
+ try:
+ # True here just means show hidden releases
+ releases = client.package_releases(package_name, True)
+ except Exception as e:
+ error("Couldn't fetch release data:", e)
+
+ return releases
+
def warn(*args, **kwargs):
print('%s:' % sys.argv[0], *args, file=sys.stderr, **kwargs)
@@ -64,7 +73,7 @@ def name_or_closest(client, package_name):
underscored_package_name = package_name.replace('-', '_')
for name in [package_name, underscored_package_name]:
- results = client.package_releases(name)
+ results = get_releases(client, name)
if len(results) > 0:
logging.debug('Found package %s' % name)
diff --git a/baserockimport/exts/python.find_deps b/baserockimport/exts/python.find_deps
index 524191e..a73c457 100755
--- a/baserockimport/exts/python.find_deps
+++ b/baserockimport/exts/python.find_deps
@@ -189,7 +189,7 @@ def resolve_versions(specsets):
logging.debug("Treating %s as %s" % (proj_name, new_proj_name))
proj_name = new_proj_name
- releases = client.package_releases(proj_name)
+ releases = get_releases(client, proj_name)
logging.debug('Found %d releases of %s: %s'
% (len(releases), proj_name, releases))