diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb index 5842e3a55b..cd9fa6db91 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -1,8 +1,9 @@ # frozen_string_literal: true -require "language/python_virtualenv_constants" - module Language + # Helper functions for Python formulae. + # + # @api public module Python def self.major_minor_version(python) version = /\d\.\d/.match `#{python} --version 2>&1` @@ -115,13 +116,9 @@ module Language def self.included(base) base.class_eval do resource "homebrew-virtualenv" do - if MacOS.version > :mojave - url PYTHON_VIRTUALENV_URL - sha256 PYTHON_VIRTUALENV_SHA256 - else - url PYTHON_VIRTUALENV_URL_MOJAVE - sha256 PYTHON_VIRTUALENV_SHA256_MOJAVE - end + url "https://files.pythonhosted.org/packages/11/74" \ + "/2c151a13ef41ab9fb43b3c4ff9e788e0496ed7923b2078d42cab30622bdf/virtualenv-16.7.4.tar.gz" + sha256 "94a6898293d07f84a98add34c4df900f8ec64a570292279f6d91c781d37fd305" end end end diff --git a/Library/Homebrew/language/python_virtualenv_constants.rb b/Library/Homebrew/language/python_virtualenv_constants.rb deleted file mode 100644 index bb4a69df5b..0000000000 --- a/Library/Homebrew/language/python_virtualenv_constants.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -PYTHON_VIRTUALENV_URL = - "https://files.pythonhosted.org/packages/11/74" \ - "/2c151a13ef41ab9fb43b3c4ff9e788e0496ed7923b2078d42cab30622bdf" \ - "/virtualenv-16.7.4.tar.gz" -PYTHON_VIRTUALENV_SHA256 = - "94a6898293d07f84a98add34c4df900f8ec64a570292279f6d91c781d37fd305" - -PYTHON_VIRTUALENV_URL_MOJAVE = - "https://files.pythonhosted.org/packages/b1/72" \ - "/2d70c5a1de409ceb3a27ff2ec007ecdd5cc52239e7c74990e32af57affe9" \ - "/virtualenv-15.2.0.tar.gz" -PYTHON_VIRTUALENV_SHA256_MOJAVE = - "1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54" diff --git a/Library/Homebrew/sorbet/files.yaml b/Library/Homebrew/sorbet/files.yaml index 444006e5f3..f6a6896dc1 100644 --- a/Library/Homebrew/sorbet/files.yaml +++ b/Library/Homebrew/sorbet/files.yaml @@ -951,7 +951,6 @@ strict: - ./extend/os/tap.rb - ./extend/os/utils/analytics.rb - ./language/haskell.rb - - ./language/python_virtualenv_constants.rb - ./os/global.rb - ./os/linux/diagnostic.rb - ./requirements.rb diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index ca6c39655c..e6a89ae9af 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -13394,10 +13394,6 @@ class Object OFFICIAL_CASK_TAPS = ::T.let(nil, ::T.untyped) OFFICIAL_CMD_TAPS = ::T.let(nil, ::T.untyped) OS_VERSION = ::T.let(nil, ::T.untyped) - PYTHON_VIRTUALENV_SHA256 = ::T.let(nil, ::T.untyped) - PYTHON_VIRTUALENV_SHA256_MOJAVE = ::T.let(nil, ::T.untyped) - PYTHON_VIRTUALENV_URL = ::T.let(nil, ::T.untyped) - PYTHON_VIRTUALENV_URL_MOJAVE = ::T.let(nil, ::T.untyped) RUBY_COPYRIGHT = ::T.let(nil, ::T.untyped) RUBY_DESCRIPTION = ::T.let(nil, ::T.untyped) RUBY_ENGINE = ::T.let(nil, ::T.untyped)