admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils/pypi: don't overwrite name/extras/version from basic_metadata if already set

Browse Source
This commit is contained in:
Dustin Rodrigues 2023-07-17 21:50:26 -04:00
parent 7ee069ef47
commit b12f714a44
No known key found for this signature in database
GPG Key ID: 140DABE812A1491D
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/utils/pypi.rb
View File

@ -127,9 +127,9 @@ module PyPI
match = File.basename(@package_string).match(/^(.+)-([a-z\d.]+?)(?:.tar.gz|.zip)$/) match = File.basename(@package_string).match(/^(.+)-([a-z\d.]+?)(?:.tar.gz|.zip)$/)
raise ArgumentError, "Package should be a valid PyPI URL" if match.blank? raise ArgumentError, "Package should be a valid PyPI URL" if match.blank?
@name = PyPI.normalize_python_package match[1] @name ||= PyPI.normalize_python_package match[1]
@extras = [] @extras ||= []
@version = match[2] @version ||= match[2]
elsif @is_url elsif @is_url
ensure_formula_installed!("python") ensure_formula_installed!("python")
@ -152,9 +152,9 @@ module PyPI
metadata = JSON.parse(pip_output)["install"].first["metadata"] metadata = JSON.parse(pip_output)["install"].first["metadata"]
@name = PyPI.normalize_python_package metadata["name"] @name ||= PyPI.normalize_python_package metadata["name"]
@extras = [] @extras ||= []
@version = metadata["version"] @version ||= metadata["version"]
else else
if @package_string.include? "==" if @package_string.include? "=="
name, version = @package_string.split("==") name, version = @package_string.split("==")
@ -170,9 +170,9 @@ module PyPI
extras = [] extras = []
end end
@name = PyPI.normalize_python_package name @name ||= PyPI.normalize_python_package name
@extras = extras @extras ||= extras
@version = version @version ||= version
end end
end end
end end