Skip to content

Commit 5cf6e35

Browse files
committed
Update Python vimrc detection to 3.10
CI build has been updated to build MacVim against Python 3.10, so we want to update the other detection to use 3.10 as well. Also added a comment to CI file to make sure we remember to update the vimrc file when updating the version.
1 parent 787158f commit 5cf6e35

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/ci-macvim.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
vi_cv_path_ruby: /usr/local/opt/ruby/bin/ruby
1818
vi_cv_dll_name_perl: /System/Library/Perl/5.18/darwin-thread-multi-2level/CORE/libperl.dylib
1919
vi_cv_dll_name_python: /System/Library/Frameworks/Python.framework/Versions/2.7/Python
20-
vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/3.10/Python
20+
vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/3.10/Python # Make sure to keep src/MacVim/vimrc synced with the Python version here for the Python DLL detection logic.
2121
vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/3.10/Python
2222
vi_cv_dll_name_ruby: /usr/local/opt/ruby/lib/libruby.dylib
2323
vi_cv_dll_name_ruby_arm64: /opt/homebrew/opt/ruby/lib/libruby.dylib

src/MacVim/vimrc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ endif
3232
" or an installation from python.org:
3333
if exists("&pythonthreedll") && exists("&pythonthreehome") &&
3434
\ !filereadable(&pythonthreedll)
35-
if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python")
36-
" MacPorts python 3.9
37-
set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python
38-
elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python")
35+
if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.10/Python")
36+
" MacPorts python 3.10
37+
set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.10/Python
38+
elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.10/Python")
3939
" https://www.python.org/downloads/mac-osx/
40-
set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python
40+
set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.10/Python
4141
endif
4242
endif
4343

44+
" vim: sw=2 ts=2 et

0 commit comments

Comments
 (0)