[Python-checkins] gh-103088: Ensure POSIX venv scripts always use LF line endings (GH-103591)
zooba
webhook-mailer at python.org
Mon Apr 17 12:34:38 EDT 2023
https://github.com/python/cpython/commit/eb5fd31948e2e379635e17545c18c9ef5d06d3e7
commit: eb5fd31948e2e379635e17545c18c9ef5d06d3e7
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2023-04-17T17:33:54+01:00
summary:
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
files:
M .gitattributes
M Lib/venv/scripts/common/activate
M Lib/venv/scripts/posix/activate.csh
M Lib/venv/scripts/posix/activate.fish
diff --git a/.gitattributes b/.gitattributes
index cb1cf8bcc7c8..4ed95069442f 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 cb898b39670c..408df5cb93b9 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 d6f697c55ed8..5e8d66fa9e50 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 <davidedb at gmail.com>.
# Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov at gmail.com>
diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish
index 9aa4446005f4..91ad6442e056 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 <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
More information about the Python-checkins
mailing list