Commit fea4635a authored by Kirill Smelkov's avatar Kirill Smelkov

Point eggs with nxd in version to http://www.nexedi.org/static/

For example SOAPpy-0.12.0nxd001 is available only there, and

	https://pypi.org/project/SOAPpy/0.12.0nxd001/

is 404.
parent 3ef92f4b
...@@ -64,6 +64,10 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo ...@@ -64,6 +64,10 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo
m = re.match(r'(?P<ver>.*)\+slapospatched.*', ver, re.I) m = re.match(r'(?P<ver>.*)\+slapospatched.*', ver, re.I)
if m is not None: if m is not None:
v = m.group('ver') v = m.group('ver')
# if ver comes with nxd -> use nexedi.org instead of pypi
if 'nxd' in v.lower():
url = 'http://www.nexedi.org/static/packages/source/%s-%s.tar.gz' % (name, v)
else:
url = 'https://pypi.org/project/%s/%s/' % (name, v) url = 'https://pypi.org/project/%s/%s/' % (name, v)
else: else:
raise NotImplementedError('TODO url for kind %r (urlpath: %r)' % (kind, urlpath)) raise NotImplementedError('TODO url for kind %r (urlpath: %r)' % (kind, urlpath))
......
...@@ -252,6 +252,19 @@ __buildout_installed__ = /ROOT/develop-eggs/astroid-1.3.8+slapospatched001-py2.7 ...@@ -252,6 +252,19 @@ __buildout_installed__ = /ROOT/develop-eggs/astroid-1.3.8+slapospatched001-py2.7
astroid 1.3.8+slapospatched001 https://pypi.org/project/astroid/1.3.8/ astroid 1.3.8+slapospatched001 https://pypi.org/project/astroid/1.3.8/
""") """)
# nxd in egg version -> nexedi.org
case1("""\
[testrunner]
recipe = zc.recipe.egg
_d = /ROOT/develop-eggs
_e = /ROOT/eggs
eggs = SOAPpy
-- /ROOT/eggs/SOAPpy-0.12.0nxd001-py2.7.egg/x --
""", """
>>> eggs:
SOAPpy 0.12.0nxd001 http://www.nexedi.org/static/packages/source/SOAPpy-0.12.0nxd001.tar.gz
""")
# %20 in URL # %20 in URL
case1("""\ case1("""\
[zabbix-agent] [zabbix-agent]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment