From eb5fd31948e2e379635e17545c18c9ef5d06d3e7 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Mon, 17 Apr 2023 17:33:54 +0100 Subject: [PATCH] gh-103088: Ensure POSIX venv scripts always use LF line endings (GH-103591) Also touches the affected files in meaningless ways to ensure they get updated when pulling --- .gitattributes | 1 + Lib/venv/scripts/common/activate | 2 +- Lib/venv/scripts/posix/activate.csh | 1 + Lib/venv/scripts/posix/activate.fish | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index cb1cf8bcc7c..4ed95069442 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate index cb898b39670..408df5cb93b 100644 --- a/Lib/venv/scripts/common/activate +++ b/Lib/venv/scripts/common/activate @@ -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 diff --git a/Lib/venv/scripts/posix/activate.csh b/Lib/venv/scripts/posix/activate.csh index d6f697c55ed..5e8d66fa9e5 100644 --- a/Lib/venv/scripts/posix/activate.csh +++ b/Lib/venv/scripts/posix/activate.csh @@ -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 . # Ported to Python 3.3 venv by Andrew Svetlov diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish index 9aa4446005f..91ad6442e05 100644 --- a/Lib/venv/scripts/posix/activate.fish +++ b/Lib/venv/scripts/posix/activate.fish @@ -1,5 +1,5 @@ # This file must be used with "source /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