diff --git a/Library/Homebrew/livecheck/strategy/pypi.rb b/Library/Homebrew/livecheck/strategy/pypi.rb index 9ff3184e76..0b23cfcbfe 100644 --- a/Library/Homebrew/livecheck/strategy/pypi.rb +++ b/Library/Homebrew/livecheck/strategy/pypi.rb @@ -67,7 +67,7 @@ module Homebrew regex_suffix = Regexp.escape(suffix).gsub("\\-", "-") # Example regex: `%r{href=.*?/packages.*?/example[._-]v?(\d+(?:\.\d+)*(?:[._-]post\d+)?)\.t}i` - regex_name = Regexp.escape(T.must(match[:package_name])).gsub("\\-", "-") + regex_name = Regexp.escape(T.must(match[:package_name])).gsub(/\\[_-]/, "[_-]") values[:regex] = %r{href=.*?/packages.*?/#{regex_name}[._-]v?(\d+(?:\.\d+)*(?:[._-]post\d+)?)#{regex_suffix}}i diff --git a/Library/Homebrew/test/livecheck/strategy/pypi_spec.rb b/Library/Homebrew/test/livecheck/strategy/pypi_spec.rb index eb568aeecf..2cdd945c11 100644 --- a/Library/Homebrew/test/livecheck/strategy/pypi_spec.rb +++ b/Library/Homebrew/test/livecheck/strategy/pypi_spec.rb @@ -5,13 +5,13 @@ require "livecheck/strategy" RSpec.describe Homebrew::Livecheck::Strategy::Pypi do subject(:pypi) { described_class } - let(:pypi_url) { "https://files.pythonhosted.org/packages/ab/cd/efg/example-1.2.3.tar.gz" } + let(:pypi_url) { "https://files.pythonhosted.org/packages/ab/cd/efg/example-package-1.2.3.tar.gz" } let(:non_pypi_url) { "https://brew.sh/test" } let(:generated) do { - url: "https://pypi.org/project/example/#files", - regex: %r{href=.*?/packages.*?/example[._-]v?(\d+(?:\.\d+)*(?:[._-]post\d+)?)\.t}i, + url: "https://pypi.org/project/example-package/#files", + regex: %r{href=.*?/packages.*?/example[_-]package[._-]v?(\d+(?:\.\d+)*(?:[._-]post\d+)?)\.t}i, } end