File tree 2 files changed +9
-0
lines changed
2 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -6437,6 +6437,10 @@ function usePyPy(majorVersion, architecture) {
6437
6437
core . exportVariable ( 'pythonLocation' , pythonLocation ) ;
6438
6438
core . addPath ( installDir ) ;
6439
6439
core . addPath ( _binDir ) ;
6440
+ // Starting from PyPy 7.3.1, the folder that is used for pip and anything that pip installs should be "Scripts" on Windows.
6441
+ if ( IS_WINDOWS ) {
6442
+ core . addPath ( path . join ( installDir , 'Scripts' ) ) ;
6443
+ }
6440
6444
const impl = 'pypy' + majorVersion . toString ( ) ;
6441
6445
core . setOutput ( 'python-version' , impl ) ;
6442
6446
return { impl : impl , version : versionFromPath ( installDir ) } ;
@@ -6515,6 +6519,7 @@ function findPythonVersion(version, architecture) {
6515
6519
case 'PYPY2' :
6516
6520
return usePyPy ( '2' , architecture ) ;
6517
6521
case 'PYPY3' :
6522
+ // keep pypy3 pointing to 3.6 for backward compatibility
6518
6523
return usePyPy ( '3.6' , architecture ) ;
6519
6524
default :
6520
6525
return yield useCpythonVersion ( version , architecture ) ;
Original file line number Diff line number Diff line change @@ -80,6 +80,10 @@ function usePyPy(
80
80
81
81
core . addPath ( installDir ) ;
82
82
core . addPath ( _binDir ) ;
83
+ // Starting from PyPy 7.3.1, the folder that is used for pip and anything that pip installs should be "Scripts" on Windows.
84
+ if ( IS_WINDOWS ) {
85
+ core . addPath ( path . join ( installDir , 'Scripts' ) ) ;
86
+ }
83
87
84
88
const impl = 'pypy' + majorVersion . toString ( ) ;
85
89
core . setOutput ( 'python-version' , impl ) ;
You can’t perform that action at this time.
0 commit comments