From fab0ea6fda13255f8ab64df1ca823d1c958af893 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 1 Jan 2018 09:33:43 +0000 Subject: [PATCH] Deprecate Homebrew/homebrew-science --- Library/Homebrew/official_taps.rb | 2 +- Library/Homebrew/test/dev-cmd/tap_spec.rb | 2 +- docs/How-To-Open-a-Homebrew-Pull-Request.md | 2 +- docs/Interesting-Taps-and-Forks.md | 2 -- docs/Migrating-A-Formula-To-A-Tap.md | 2 +- docs/Python-for-Formula-Authors.md | 2 -- docs/Troubleshooting.md | 2 +- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb index d2e4753d9b..7eace302a5 100644 --- a/Library/Homebrew/official_taps.rb +++ b/Library/Homebrew/official_taps.rb @@ -1,6 +1,5 @@ OFFICIAL_TAPS = %w[ php - science ].freeze OFFICIAL_CASK_TAPS = %w[ @@ -27,6 +26,7 @@ DEPRECATED_OFFICIAL_TAPS = %w[ head-only nginx python + science tex versions x11 diff --git a/Library/Homebrew/test/dev-cmd/tap_spec.rb b/Library/Homebrew/test/dev-cmd/tap_spec.rb index 93e9c0ed60..d09d0245f3 100644 --- a/Library/Homebrew/test/dev-cmd/tap_spec.rb +++ b/Library/Homebrew/test/dev-cmd/tap_spec.rb @@ -16,7 +16,7 @@ describe "brew tap", :integration_test do .and be_a_success expect { brew "tap", "--list-official" } - .to output(%r{homebrew/science}).to_stdout + .to output(%r{homebrew/php}).to_stdout .and not_to_output.to_stderr .and be_a_success diff --git a/docs/How-To-Open-a-Homebrew-Pull-Request.md b/docs/How-To-Open-a-Homebrew-Pull-Request.md index 173ea4e1d8..812d990e08 100644 --- a/docs/How-To-Open-a-Homebrew-Pull-Request.md +++ b/docs/How-To-Open-a-Homebrew-Pull-Request.md @@ -25,7 +25,7 @@ Depending on the change you want to make, you need to send the pull request to t 3. Add your pushable forked repository with `git remote add https://github.com//homebrew-core.git` * `` is your GitHub username, not your local machine username. -For formulae in central taps other than `homebrew/core`, such as `homebrew/science` or `homebrew/php`, substitute that tap's name for `homebrew/core` in each step, and alter the GitHub repository URLs as necessary. +For formulae in central taps other than `homebrew/core`, such as `homebrew/php`, substitute that tap's name for `homebrew/core` in each step, and alter the GitHub repository URLs as necessary. ## Create your pull request from a new branch diff --git a/docs/Interesting-Taps-and-Forks.md b/docs/Interesting-Taps-and-Forks.md index b492386748..20fe0efdec 100644 --- a/docs/Interesting-Taps-and-Forks.md +++ b/docs/Interesting-Taps-and-Forks.md @@ -7,8 +7,6 @@ Homebrew has the capability to add (and remove) multiple taps to your local inst * [homebrew/php](https://github.com/Homebrew/homebrew-php): Repository for PHP-related formulae. -* [homebrew/science](https://github.com/Homebrew/homebrew-science): A collection of scientific libraries and tools. - `brew search` looks in these taps as well as in [homebrew/core](https://github.com/Homebrew/homebrew-core) so don't worry about missing stuff. You can be added as a maintainer for one of the Homebrew organization taps and aid the project! If you are interested please feel free to ask in an issue or pull request after submitting multiple high-quality pull requests. We want your help! diff --git a/docs/Migrating-A-Formula-To-A-Tap.md b/docs/Migrating-A-Formula-To-A-Tap.md index 08ba2df374..7e1431adbb 100644 --- a/docs/Migrating-A-Formula-To-A-Tap.md +++ b/docs/Migrating-A-Formula-To-A-Tap.md @@ -3,7 +3,7 @@ There are times when we may wish to migrate a formula from one tap into another tap. To do this: 1. Create a pull request to the new tap adding the formula file as-is from the original tap. Fix any test failures that may occur due to the stricter requirements for new formulae than existing formula (e.g. `brew audit --strict` must pass for that formula). -2. Create a pull request to the original tap deleting the formula file and add it to `tap_migrations.json` with a commit message like `gv: migrating to homebrew/science`. +2. Create a pull request to the original tap deleting the formula file and add it to `tap_migrations.json` with a commit message like `gv: migrate to homebrew/core`. 3. Put a link for each pull request in the other pull request so the maintainers can merge them both at once. Congratulations, you've moved a formula to a tap! diff --git a/docs/Python-for-Formula-Authors.md b/docs/Python-for-Formula-Authors.md index 129f5ba5ed..13b96e563a 100644 --- a/docs/Python-for-Formula-Authors.md +++ b/docs/Python-for-Formula-Authors.md @@ -165,8 +165,6 @@ Most formulae presently just install to `prefix`. The dependencies of libraries must be installed so that they are importable. To minimize the potential for linking conflicts, dependencies should be installed to `libexec/"vendor"` and added to `sys.path` by writing a second .pth file (named like "homebrew-foo-dependencies.pth") to the `prefix` site-packages. -The [matplotlib](https://github.com/Homebrew/homebrew-science/blob/master/matplotlib.rb) formula in [homebrew/science](https://github.com/Homebrew/homebrew-science) deploys this strategy. - ## Further down the rabbit hole Additional commentary that explains why Homebrew does some of the things it does. diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md index 2ffa256d10..8b1bd73127 100644 --- a/docs/Troubleshooting.md +++ b/docs/Troubleshooting.md @@ -17,7 +17,7 @@ Follow these steps to fix common problems: ## Check to see if the issue has been reported * Search the [issue tracker](https://github.com/Homebrew/homebrew-core/issues) to see if someone else has already reported the same issue. -* Make sure you search issues on the correct repository. If a formula that has failed to build is part of a tap like [homebrew/science](https://github.com/Homebrew/homebrew-science/issues) or a cask is part of [caskroom/cask](https://github.com/caskroom/homebrew-cask/issues) check those issue trackers instead. +* Make sure you search issues on the correct repository. If a formula that has failed to build is part of a tap like [homebrew/php](https://github.com/Homebrew/homebrew-php/issues) or a cask is part of [caskroom/cask](https://github.com/caskroom/homebrew-cask/issues) check those issue trackers instead. ## Create an issue