From 3dd94f993d04fcc8f7f71626193243ca7bf4bb26 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Wed, 3 Feb 2021 19:30:55 -0500 Subject: [PATCH 1/5] docs: add a note about the stability of python 3 formulae --- docs/Homebrew-and-Python.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/Homebrew-and-Python.md b/docs/Homebrew-and-Python.md index 0ebdde901d..6182b7b921 100644 --- a/docs/Homebrew-and-Python.md +++ b/docs/Homebrew-and-Python.md @@ -13,6 +13,12 @@ Homebrew provided a `python@2` formula until the end of 2019, at which point it ## Python 3.x Homebrew provides a formula for Python 3.x (`python@3.x`). +**Important:** Homebrew does not guarantee that Python 3, once installed, remains the same version. +In particular, Homebrew may choose to upgrade the minor or patch version of Python 3, which may in +turn break any custom virtual environments that use the Homebrewed Python. Python developers +who expect virtual environment stability should consider using a Python version manager rather than +the Homebrewed Python. + The executables are organised as follows: * `python3` points to Homebrew's Python 3.x (if installed) From f35c3a4e8652dc4ae46bc90150bffc32f9df2a1a Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Wed, 3 Feb 2021 20:16:10 -0500 Subject: [PATCH 2/5] docs: simplify --- docs/Homebrew-and-Python.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/Homebrew-and-Python.md b/docs/Homebrew-and-Python.md index 6182b7b921..68f030a9d2 100644 --- a/docs/Homebrew-and-Python.md +++ b/docs/Homebrew-and-Python.md @@ -13,11 +13,8 @@ Homebrew provided a `python@2` formula until the end of 2019, at which point it ## Python 3.x Homebrew provides a formula for Python 3.x (`python@3.x`). -**Important:** Homebrew does not guarantee that Python 3, once installed, remains the same version. -In particular, Homebrew may choose to upgrade the minor or patch version of Python 3, which may in -turn break any custom virtual environments that use the Homebrewed Python. Python developers -who expect virtual environment stability should consider using a Python version manager rather than -the Homebrewed Python. +**Important**: Python may be upgraded to a newer version at any time. Consider using a version +manager such as `pyenv` if you require stability of minor or patch versions for virtual environments. The executables are organised as follows: From 4d1c369b1ea960070f9fc225aaf2e11c2b75f7b3 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 4 Feb 2021 09:02:39 +0000 Subject: [PATCH 3/5] Add Codecov GitHub Action step --- .github/workflows/tests.yml | 3 ++- Library/Homebrew/Gemfile | 1 - Library/Homebrew/Gemfile.lock | 3 --- Library/Homebrew/test/spec_helper.rb | 8 +++----- Library/Homebrew/vendor/bundle/bundler/setup.rb | 1 - 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 29c9a57250..6e586b255b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -164,7 +164,8 @@ jobs: brew tests ${{ matrix.test-flags }} env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - HOMEBREW_CODECOV_TOKEN: 3ea0364c-80ce-47a3-9fba-93a940d4b5d7 + + - uses: codecov/codecov-action@v1 test-default-formula-linux: name: test default formula (Linux) diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index f13e5f3bbf..d76ebf5fa8 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" # installed gems (should all be require: false) gem "bootsnap", require: false gem "byebug", require: false -gem "codecov", require: false gem "nokogiri", require: false gem "parallel_tests", require: false gem "ronn", require: false diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index 21073312a0..a0d62d2ce9 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -12,8 +12,6 @@ GEM bootsnap (1.7.0) msgpack (~> 1.0) byebug (11.1.3) - codecov (0.4.2) - simplecov (>= 0.15, < 0.22) coderay (1.1.3) colorize (0.8.1) commander (4.5.2) @@ -174,7 +172,6 @@ DEPENDENCIES activesupport bootsnap byebug - codecov concurrent-ruby mechanize nokogiri diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 7b7b3bfe3c..5726204417 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -5,10 +5,10 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] require "simplecov" formatters = [SimpleCov::Formatter::HTMLFormatter] - if ENV["HOMEBREW_CODECOV_TOKEN"] && RUBY_PLATFORM[/darwin/] - require "codecov" + if RUBY_PLATFORM[/darwin/] + require "simplecov_json_formatter" - formatters << SimpleCov::Formatter::Codecov + formatters << SimpleCov::Formatter::JSONFormatter if ENV["TEST_ENV_NUMBER"] SimpleCov.at_exit do @@ -16,8 +16,6 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] result.format! if ParallelTests.number_of_running_processes <= 1 end end - - ENV["CODECOV_TOKEN"] = ENV["HOMEBREW_CODECOV_TOKEN"] end SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(formatters) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index e7244827b6..ca5e3a15c0 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -22,7 +22,6 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.5/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.12.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov_json_formatter-0.1.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.21.2/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/codecov-0.4.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coderay-1.1.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/colorize-0.8.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/highline-2.0.3/lib" From 1b2dab5efa54d184cb7185dc2b16383192e20e78 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 4 Feb 2021 09:06:06 +0000 Subject: [PATCH 4/5] Remove more codecov gem references. --- .gitignore | 1 - .../sorbet/rbi/gems/codecov@0.4.2.rbi | 8 -- .../sorbet/rbi/hidden-definitions/hidden.rbi | 81 ------------------- 3 files changed, 90 deletions(-) delete mode 100644 Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi diff --git a/.gitignore b/.gitignore index 1336c48acd..f89b0e524a 100644 --- a/.gitignore +++ b/.gitignore @@ -92,7 +92,6 @@ **/vendor/bundle/ruby/*/gems/colorize-*/ **/vendor/bundle/ruby/*/gems/commander-*/ **/vendor/bundle/ruby/*/gems/connection_pool-*/ -**/vendor/bundle/ruby/*/gems/codecov-*/ **/vendor/bundle/ruby/*/gems/diff-lcs-*/ **/vendor/bundle/ruby/*/gems/docile-*/ **/vendor/bundle/ruby/*/gems/domain_name-*/ diff --git a/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi b/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi deleted file mode 100644 index a33dc8c1df..0000000000 --- a/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT MANUALLY -# This is an autogenerated file for types exported from the `codecov` gem. -# Please instead update this file by running `tapioca sync`. - -# typed: true - -# THIS IS AN EMPTY RBI FILE. -# see https://github.com/Shopify/tapioca/blob/master/README.md#manual-gem-requires diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 0742430cb8..c712de39b0 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -6105,80 +6105,6 @@ module CodeRay def self.scanner(lang, options=T.unsafe(nil), &block); end end -module Codecov - VERSION = ::T.let(nil, ::T.untyped) -end - -module Codecov::SimpleCov -end - -class Codecov::SimpleCov::Formatter - def format(report); end - RESULT_FILE_NAME = ::T.let(nil, ::T.untyped) -end - -class Codecov::SimpleCov::Formatter -end - -module Codecov::SimpleCov -end - -class Codecov::Uploader - APPVEYOR = ::T.let(nil, ::T.untyped) - AZUREPIPELINES = ::T.let(nil, ::T.untyped) - BITBUCKET = ::T.let(nil, ::T.untyped) - BITRISE = ::T.let(nil, ::T.untyped) - BUILDKITE = ::T.let(nil, ::T.untyped) - CIRCLE = ::T.let(nil, ::T.untyped) - CODEBUILD = ::T.let(nil, ::T.untyped) - CODESHIP = ::T.let(nil, ::T.untyped) - DRONEIO = ::T.let(nil, ::T.untyped) - GITHUB = ::T.let(nil, ::T.untyped) - GITLAB = ::T.let(nil, ::T.untyped) - HEROKU = ::T.let(nil, ::T.untyped) - JENKINS = ::T.let(nil, ::T.untyped) - RECOGNIZED_CIS = ::T.let(nil, ::T.untyped) - SEMAPHORE = ::T.let(nil, ::T.untyped) - SHIPPABLE = ::T.let(nil, ::T.untyped) - SOLANO = ::T.let(nil, ::T.untyped) - TEAMCITY = ::T.let(nil, ::T.untyped) - TRAVIS = ::T.let(nil, ::T.untyped) - WERCKER = ::T.let(nil, ::T.untyped) -end - -class Codecov::Uploader - def self.black(str); end - - def self.build_params(ci); end - - def self.detect_ci(); end - - def self.display_header(); end - - def self.green(str); end - - def self.gzip_report(report); end - - def self.handle_report_response(report); end - - def self.net_blockers(switch); end - - def self.red(str); end - - def self.retry_request(req, https); end - - def self.upload(report, disable_net_blockers=T.unsafe(nil)); end - - def self.upload_to_codecov(ci, report); end - - def self.upload_to_v2(url, report, query, query_without_token); end - - def self.upload_to_v4(url, report, query, query_without_token); end -end - -module Codecov -end - class CompilerSelector::Compiler def self.[](*_); end @@ -28306,13 +28232,6 @@ end module SimpleCov::Formatter end -class SimpleCov::Formatter::Codecov - def format(result, disable_net_blockers=T.unsafe(nil)); end -end - -class SimpleCov::Formatter::Codecov -end - class SimpleCov::Formatter::HTMLFormatter def branchable_result?(); end From 44fae4588958cefaaa21f80679d5ea11e2b32c62 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 4 Feb 2021 09:06:17 +0000 Subject: [PATCH 5/5] workflows/tests: more codecov cleanup. --- .github/workflows/tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6e586b255b..81548ebb8c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -165,7 +165,7 @@ jobs: env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 test-default-formula-linux: name: test default formula (Linux) @@ -261,8 +261,6 @@ jobs: run: brew tests --online --coverage env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Set variables for coverage reporting. - HOMEBREW_CODECOV_TOKEN: 3ea0364c-80ce-47a3-9fba-93a940d4b5d7 # These cannot be queried at the macOS level on GitHub Actions. HOMEBREW_LANGUAGES: en-GB