activate.fish: update fish major version check #2891
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gaborbernat
previously approved these changes
May 27, 2025
Use fish's [`string sub`][ss] command to get fish's major version from `$FISH_VERSION`. The [`head`][head] program in OpenBSD does not have the `-c` flag. Addresses #2892. [head]: https://man.openbsd.org/head [ss]: https://fishshell.com/docs/current/cmds/string.html#sub-subcommand
auto-merge was automatically disabled
May 28, 2025 23:07
Head branch was pushed to by a user without write access
Contributor
Author
|
@gaborbernat some tests are failing and it does not seem to be related to the changes in this PR. Are you able to look into it and possibly get this merged? |
gaborbernat
reviewed
Jun 22, 2025
Contributor
gaborbernat
left a comment
gaborbernat
left a comment
There was a problem hiding this comment.
Let's not worry about other tests until you add a test to validate your change.
Add `test_fish_path` to verify that the PATH is reverted to the original PATH after virtualenv deactivation. This verification confirms that the `_OLD_VIRTUAL_PATH` was correctly set in fish during the activation of the virtualenv.
Contributor
Author
Added a test in See if it looks good. |
gaborbernat
reviewed
Jun 30, 2025
Move test `test_fish_path` into `test_fish`. Rename the class that verifies the preservation of original `PATH` after virtualenv deactivation to `FishPath`.
gaborbernat
reviewed
Jun 30, 2025
Merge test in `FishPath` into `Fish`.
gaborbernat
approved these changes
Jul 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use fish's
string subcommand to get fish's major version from$FISH_VERSION.The
headprogram in OpenBSD does not have the-cflag.Addresses #2892.