Skip to content

Commit 2bea2c2

Browse files
bollwyvlbollwyvl
committed
restore {{ name }} variant yield
1 parent 4b91569 commit 2bea2c2

File tree

2 files changed

+148
-0
lines changed

2 files changed

+148
-0
lines changed

‎conda_forge_tick/url_transforms.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,14 @@ def _pypi_name_munger(url):
6161
is_sdist = url.endswith(".tar.gz")
6262
is_pypi = any(url.startswith(pypi) for pypi in PYPI_URLS)
6363
has_version = re.search(r"\{\{\s*version", bn)
64+
has_name = re.search(r"\{\{\s*name", bn)
6465

6566
# try the original URL first, as a fallback (probably can't be removed?)
6667
yield url
6768

69+
if is_pypi and has_version and not has_name:
70+
yield os.path.join(dn, "{{ name }}-{{ version }}.tar.gz")
71+
6872
if not (is_sdist and is_pypi and has_version):
6973
return
7074

‎tests/test_url_transforms.py‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,78 @@ def test_url_transform_complicated_github():
335335
https://pypi.io/packages/source/p/packageurl-python/packageurl-python-v{{ version }}.tar.xz
336336
https://pypi.io/packages/source/p/packageurl-python/packageurl-python-v{{ version }}.tgz
337337
https://pypi.io/packages/source/p/packageurl-python/packageurl-python-v{{ version }}.zip
338+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar
339+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar.bz2
340+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar.gz
341+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar.xz
342+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tgz
343+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-{{ version }}.zip
344+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar
345+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar.bz2
346+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar.gz
347+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar.xz
348+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tgz
349+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.zip
350+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar
351+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar.bz2
352+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar.gz
353+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar.xz
354+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tgz
355+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.zip
356+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar
357+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar.bz2
358+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar.gz
359+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar.xz
360+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tgz
361+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.zip
362+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar
363+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar.bz2
364+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
365+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar.xz
366+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tgz
367+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.zip
368+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar
369+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar.bz2
370+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar.gz
371+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar.xz
372+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tgz
373+
https://files.pythonhosted.org/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.zip
374+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar
375+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar.bz2
376+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar.gz
377+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tar.xz
378+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-{{ version }}.tgz
379+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-{{ version }}.zip
380+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar
381+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar.bz2
382+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar.gz
383+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tar.xz
384+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.tgz
385+
https://pypi.io/packages/source/p/packageurl-python/{{ name }}-v{{ version }}.zip
386+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar
387+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar.bz2
388+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar.gz
389+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tar.xz
390+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.tgz
391+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-{{ version }}.zip
392+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar
393+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar.bz2
394+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar.gz
395+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tar.xz
396+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.tgz
397+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('_', '-') }}-v{{ version }}.zip
398+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar
399+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar.bz2
400+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
401+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tar.xz
402+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.tgz
403+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-{{ version }}.zip
404+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar
405+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar.bz2
406+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar.gz
407+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tar.xz
408+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.tgz
409+
https://pypi.io/packages/source/p/packageurl-python/{{ name.replace('-', '_') }}-v{{ version }}.zip
338410
""",
339411
"""
340412
https://pypi.io/packages/source/p/worst-case/Worst.-Case-{{ version }}.tar.gz
@@ -387,6 +459,78 @@ def test_url_transform_complicated_github():
387459
https://pypi.io/packages/source/p/worst-case/Worst.-Case-v{{ version }}.tar.xz
388460
https://pypi.io/packages/source/p/worst-case/Worst.-Case-v{{ version }}.tgz
389461
https://pypi.io/packages/source/p/worst-case/Worst.-Case-v{{ version }}.zip
462+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-{{ version }}.tar.bz2
463+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-{{ version }}.tar.gz
464+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-{{ version }}.tar.xz
465+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-{{ version }}.tar
466+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-{{ version }}.tgz
467+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-{{ version }}.zip
468+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar.bz2
469+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar.gz
470+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar.xz
471+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar
472+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-v{{ version }}.tgz
473+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name }}-v{{ version }}.zip
474+
https://pypi.io/packages/source/p/worst-case/{{ name }}-{{ version }}.tar.bz2
475+
https://pypi.io/packages/source/p/worst-case/{{ name }}-{{ version }}.tar.gz
476+
https://pypi.io/packages/source/p/worst-case/{{ name }}-{{ version }}.tar.xz
477+
https://pypi.io/packages/source/p/worst-case/{{ name }}-{{ version }}.tar
478+
https://pypi.io/packages/source/p/worst-case/{{ name }}-{{ version }}.tgz
479+
https://pypi.io/packages/source/p/worst-case/{{ name }}-{{ version }}.zip
480+
https://pypi.io/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar.bz2
481+
https://pypi.io/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar.gz
482+
https://pypi.io/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar.xz
483+
https://pypi.io/packages/source/p/worst-case/{{ name }}-v{{ version }}.tar
484+
https://pypi.io/packages/source/p/worst-case/{{ name }}-v{{ version }}.tgz
485+
https://pypi.io/packages/source/p/worst-case/{{ name }}-v{{ version }}.zip
486+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar.bz2
487+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar.gz
488+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar.xz
489+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar
490+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tgz
491+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.zip
492+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar.bz2
493+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar.gz
494+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar.xz
495+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar
496+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tgz
497+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.zip
498+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar.bz2
499+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
500+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar.xz
501+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar
502+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tgz
503+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.zip
504+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar.bz2
505+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar.gz
506+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar.xz
507+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar
508+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tgz
509+
https://files.pythonhosted.org/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.zip
510+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar.bz2
511+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar.gz
512+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar.xz
513+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tar
514+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.tgz
515+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-{{ version }}.zip
516+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar.bz2
517+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar.gz
518+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar.xz
519+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tar
520+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.tgz
521+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('_', '-') }}-v{{ version }}.zip
522+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar.bz2
523+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
524+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar.xz
525+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tar
526+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.tgz
527+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-{{ version }}.zip
528+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar.bz2
529+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar.gz
530+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar.xz
531+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tar
532+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.tgz
533+
https://pypi.io/packages/source/p/worst-case/{{ name.replace('-', '_') }}-v{{ version }}.zip
390534
""",
391535
}
392536

0 commit comments

Comments
 (0)