fix(packaging): move python packages to zip root

ilyabezdelev · Feb 8, 2021 · aff2ebe · aff2ebe
1 parent d3d4fff
commit aff2ebe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/awscli-lambda-package_linux.sh b/awscli-lambda-package_linux.sh
@@ -17,7 +17,7 @@ export ZIP_FILE_NAME="awscli-lambda-layer.zip"
 mkdir ${VIRTUAL_ENV_DIR}
 
 # Initializes a virtual environment in the virtual environment directory
-virtualenv ${VIRTUAL_ENV_DIR}
+virtualenv -p python3 ${VIRTUAL_ENV_DIR}
 
 # Changes current dir to the virtual env directory
 cd ${VIRTUAL_ENV_DIR}/bin/
@@ -46,7 +46,7 @@ cd ${LAMBDA_LAYER_DIR}
 
 # Copies aws and its dependencies to the temp directory
 cp ../${VIRTUAL_ENV_DIR}/bin/aws .
-cp -r ../${VIRTUAL_ENV_DIR}/lib/python${PYTHON_VERSION}/site-packages/ .
+cp -r ../${VIRTUAL_ENV_DIR}/lib/python${PYTHON_VERSION}/site-packages/* .
 
 # Zips the contents of the temporary directory
 zip -r ../${ZIP_FILE_NAME} *
@@ -56,4 +56,4 @@ cd ..
 
 # Removes virtual env and temp directories
 rm -r ${VIRTUAL_ENV_DIR}
-rm -r ${LAMBDA_LAYER_DIR}
+rm -r ${LAMBDA_LAYER_DIR}
diff --git a/awscli-lambda-package_macos.sh b/awscli-lambda-package_macos.sh
@@ -17,7 +17,7 @@ export ZIP_FILE_NAME="awscli-lambda-layer.zip"
 mkdir ${VIRTUAL_ENV_DIR}
 
 # Initializes a virtual environment in the virtual environment directory
-virtualenv ${VIRTUAL_ENV_DIR}
+virtualenv -p python3 ${VIRTUAL_ENV_DIR}
 
 # Changes current dir to the virtual env directory
 cd ${VIRTUAL_ENV_DIR}/bin/
@@ -46,7 +46,7 @@ cd ${LAMBDA_LAYER_DIR}
 
 # Copies aws and its dependencies to the temp directory
 cp ../${VIRTUAL_ENV_DIR}/bin/aws .
-cp -r ../${VIRTUAL_ENV_DIR}/lib/python${PYTHON_VERSION}/site-packages/ .
+cp -r ../${VIRTUAL_ENV_DIR}/lib/python${PYTHON_VERSION}/site-packages/* .
 
 # Zips the contents of the temporary directory
 zip -r ../${ZIP_FILE_NAME} *