Apply suggestions from code review

Co-Authored-By: Daniel Schep <[email protected]>

Author: jaysonsantos

lib/poetry.js

@@ -33,19 +33,19 @@ function pyprojectTomlToRequirements() {
     throw new Error(res.stderr);
   }
 
-  const editableLine = new RegExp(/^-e /gm);
+  const editableFlag = new RegExp(/^-e /gm);
   const sourceRequirements = path.join(this.servicePath, 'requirements.txt');
   const requirementsContents = fse.readFileSync(sourceRequirements, {
     encoding: 'utf-8'
   });
 
-  if (requirementsContents.match(editableLine)) {
+  if (requirementsContents.match(editableFlag)) {
     this.serverless.cli.log(
       'The generated file contains -e lines, removing them...'
     );
     fse.writeFileSync(
       sourceRequirements,
-      requirementsContents.replace(editableLine, '')
+      requirementsContents.replace(editableFlag, '')
     );
   }
 

test.js

@@ -727,13 +727,8 @@ test('poetry py3.6 can package flask with default options', t => {
   sls(['package']);
   const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
   t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
-<<<<<<< HEAD
   t.true(zipfiles.includes(`bottle${sep}__init__.py`), 'bottle is packaged');
   t.true(zipfiles.includes(`boto3${sep}__init__.py`), 'boto3 is packaged');
-=======
-  t.true(zipfiles.includes(`bottle.py`), 'bottle is packaged');
-  t.false(zipfiles.includes(`boto3${sep}__init__.py`), 'boto3 is NOT packaged');
->>>>>>> Fix wrongly expected file in test
   t.end();
 });