Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-103088: Ensure POSIX venv scripts always use LF line endings #103591

Merged
merged 1 commit into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Lib/test/xmltestdata/* noeol

# Shell scripts should have LF even on Windows because of Cygwin
Lib/venv/scripts/common/activate text eol=lf
Lib/venv/scripts/posix/* text eol=lf

# CRLF files
[attr]dos text eol=crlf
Expand Down
2 changes: 1 addition & 1 deletion Lib/venv/scripts/common/activate
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file must be used with "source bin/activate" *from bash*
# you cannot run it directly
# You cannot run it directly

deactivate () {
# reset old environment variables
Expand Down
1 change: 1 addition & 0 deletions Lib/venv/scripts/posix/activate.csh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# This file must be used with "source bin/activate.csh" *from csh*.
# You cannot run it directly.

# Created by Davide Di Blasi <davidedb@gmail.com>.
# Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com>

Expand Down
2 changes: 1 addition & 1 deletion Lib/venv/scripts/posix/activate.fish
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file must be used with "source <venv>/bin/activate.fish" *from fish*
# (https://fishshell.com/); you cannot run it directly.
# (https://fishshell.com/). You cannot run it directly.

function deactivate -d "Exit virtual environment and return to normal shell environment"
# reset old environment variables
Expand Down