File tree 2 files changed +20
-3
lines changed
2 files changed +20
-3
lines changed Original file line number Diff line number Diff line change @@ -35,9 +35,11 @@ function pyprojectTomlToRequirements() {
35
35
36
36
const editableFlag = new RegExp ( / ^ - e / gm) ;
37
37
const sourceRequirements = path . join ( this . servicePath , 'requirements.txt' ) ;
38
- const requirementsContents = fse . readFileSync ( sourceRequirements , {
39
- encoding : 'utf-8'
40
- } ) ;
38
+ const requirementsContents =
39
+ res . stdout . toString ( ) . trim ( ) || // As of poetry 1.0.0b1, requirements.txt is printed to standard output when the -o option is not specified.
40
+ fse . readFileSync ( sourceRequirements , {
41
+ encoding : 'utf-8'
42
+ } ) ;
41
43
42
44
if ( requirementsContents . match ( editableFlag ) ) {
43
45
this . serverless . cli . log (
Original file line number Diff line number Diff line change @@ -51,6 +51,7 @@ const sls = mkCommand('sls');
51
51
const git = mkCommand ( 'git' ) ;
52
52
const npm = mkCommand ( 'npm' ) ;
53
53
const perl = mkCommand ( 'perl' ) ;
54
+ const poetry = mkCommand ( 'poetry' ) ;
54
55
55
56
const setup = ( ) => {
56
57
removeSync ( getUserCachePath ( ) ) ;
@@ -1874,3 +1875,17 @@ test(
1874
1875
} ,
1875
1876
{ skip : ! canUseDocker ( ) }
1876
1877
) ;
1878
+
1879
+ // From this point on, the version of the poetry is 1.0.0a0
1880
+ test ( 'poetry1.0.0a0 py3.6 can package flask with default options' , t => {
1881
+ process . chdir ( 'tests/poetry' ) ;
1882
+ const path = npm ( [ 'pack' , '../..' ] ) ;
1883
+ npm ( [ 'i' , path ] ) ;
1884
+ poetry ( [ 'self' , 'update' , '--preview' , '1.0.0a0' ] ) ;
1885
+ sls ( [ 'package' ] ) ;
1886
+ const zipfiles = listZipFiles ( '.serverless/sls-py-req-test.zip' ) ;
1887
+ t . true ( zipfiles . includes ( `flask${ sep } __init__.py` ) , 'flask is packaged' ) ;
1888
+ t . true ( zipfiles . includes ( `bottle.py` ) , 'bottle is packaged' ) ;
1889
+ t . true ( zipfiles . includes ( `boto3${ sep } __init__.py` ) , 'boto3 is packaged' ) ;
1890
+ t . end ( ) ;
1891
+ } ) ;
You can’t perform that action at this time.
0 commit comments