Skip to content

Commit 8b5ac70

Browse files
authored
Merge pull request #3151 from regro/beckermr-patch-2
fix: try munged pypi urls with middle section left alone
2 parents 1b7e3f6 + 3cab3e1 commit 8b5ac70

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

conda_forge_tick/url_transforms.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ def _pypi_munger(url):
150150
+ "/"
151151
+ eurl.replace(_v, vrep)
152152
)
153+
yield (burl + "/" + murl + "/" + eurl.replace(_v, vrep))
153154
elif vhave in eurl or vhave in murl:
154155
assert isinstance(vrep, tuple)
155156
yield (
@@ -159,6 +160,7 @@ def _pypi_munger(url):
159160
+ "/"
160161
+ eurl.replace(vhave, vrep[0])
161162
)
163+
yield (burl + "/" + murl + "/" + eurl.replace(vhave, vrep[0]))
162164
if len(vrep) > 1:
163165
yield (
164166
burl
@@ -167,6 +169,7 @@ def _pypi_munger(url):
167169
+ "/"
168170
+ eurl.replace(vhave, vrep[1])
169171
)
172+
yield (burl + "/" + murl + "/" + eurl.replace(vhave, vrep[1]))
170173

171174

172175
def _github_munger(url):

tests/test_url_transforms.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@ def test_url_transform_pypi():
8282
"https://files.pythonhosted.org/{{ name.replace('_', '-').lower() }}/{{ name.replace('_', '-').lower() }}-barf",
8383
"https://pypi.io/{{ name.replace('-', '_').lower() }}/{{ name.replace('-', '_').lower() }}-barf",
8484
"https://pypi.io/{{ name.replace('_', '-').lower() }}/{{ name.replace('_', '-').lower() }}-barf",
85+
"https://pypi.io/{{ name }}/{{ name.replace('-', '_').lower() }}-barf",
86+
"https://files.pythonhosted.org/{{ name }}/{{ name.replace('_', '-').lower() }}-barf",
87+
"https://pypi.io/{{ name }}/{{ name.replace('_', '-') }}-barf",
88+
"https://files.pythonhosted.org/{{ name }}/{{ name|lower }}-barf",
89+
"https://files.pythonhosted.org/{{ name }}/{{ name.replace('-', '_').lower() }}-barf",
90+
"https://pypi.io/{{ name }}/{{ name.replace('-', '_') }}-barf",
91+
"https://pypi.io/{{ name }}/{{ name.replace('_', '-').lower() }}-barf",
92+
"https://files.pythonhosted.org/{{ name }}/{{ name.replace('-', '_') }}-barf",
93+
"https://pypi.io/{{ name }}/{{ name|lower }}-barf",
94+
"https://files.pythonhosted.org/{{ name }}/{{ name.replace('_', '-') }}-barf",
8595
}
8696

8797
urls = set(

0 commit comments

Comments
 (0)