diff --git a/.github/workflows/validate_pyinstaller.yml b/.github/workflows/validate_pyinstaller.yml index bb8202091a..176f60b16d 100644 --- a/.github/workflows/validate_pyinstaller.yml +++ b/.github/workflows/validate_pyinstaller.yml @@ -13,7 +13,6 @@ jobs: name: build-pyinstaller-linux runs-on: ubuntu-latest container: quay.io/pypa/manylinux2014_x86_64:latest - if: github.repository_owner == 'aws' strategy: fail-fast: false steps: @@ -40,21 +39,20 @@ jobs: build-for-mac: name: build-pyinstaller-macos runs-on: macos-latest - if: github.repository_owner == 'aws' strategy: fail-fast: false steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.12" - name: Build PyInstaller run: | chmod +x ./installer/pyinstaller/build-mac.sh ./installer/pyinstaller/build-mac.sh aws-sam-cli-macos-x86_64.zip - name: Basic tests for PyInstaller env: - SAM_INIT_RUNTIME: "python3.8" + SAM_INIT_RUNTIME: "python3.12" run: | unzip .build/output/aws-sam-cli-macos-x86_64.zip -d sam-installation sudo ./sam-installation/install diff --git a/Makefile b/Makefile index a5314e30e1..4cc4f5dd36 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ update-reproducible-linux-reqs: venv-update-reproducible-linux/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-linux.txt update-reproducible-mac-reqs: - python3.8 -m venv venv-update-reproducible-mac + python3.12 -m venv venv-update-reproducible-mac venv-update-reproducible-mac/bin/pip install --upgrade pip-tools pip venv-update-reproducible-mac/bin/pip install -r requirements/base.txt venv-update-reproducible-mac/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-mac.txt diff --git a/installer/pyinstaller/build-mac.sh b/installer/pyinstaller/build-mac.sh index f6beccdbcd..f2b67eb050 100755 --- a/installer/pyinstaller/build-mac.sh +++ b/installer/pyinstaller/build-mac.sh @@ -34,7 +34,7 @@ if [ "$openssl_version" = "" ]; then fi if [ "$python_version" = "" ]; then - python_version="3.8.13"; + python_version="3.12.3"; fi if ! [ "$build_binary_name" = "" ]; then @@ -92,13 +92,15 @@ echo "Installing Python" curl "https://www.python.org/ftp/python/${python_version}/Python-${python_version}.tgz" --output python.tgz tar -xzf python.tgz cd Python-"$python_version" -./configure --enable-shared +./configure \ + --enable-shared \ + --with-openssl=/usr/local make -j8 sudo make -j8 install cd .. echo "Installing Python Libraries" -/usr/local/bin/python3.8 -m venv venv +/usr/local/bin/python3.12 -m venv venv ./venv/bin/pip install --upgrade pip ./venv/bin/pip install -r src/requirements/reproducible-mac.txt diff --git a/requirements/base.txt b/requirements/base.txt index 9d29dc485b..7f5a205868 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -11,7 +11,7 @@ aws-sam-translator==1.87.0 docker~=7.0.0 dateparser~=1.2 requests~=2.31.0 -aws_lambda_builders==1.48.0 +aws_lambda_builders==1.49.0 tomlkit==0.12.4 watchdog==4.0.0 rich~=13.7.1 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 727947e94a..e62963155a 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -20,9 +20,9 @@ attrs==23.2.0 \ # jsonschema # referencing # sarif-om -aws-lambda-builders==1.48.0 \ - --hash=sha256:01a2f41a49c118066a05428a924f08b65112565b155e43beb980517a6d295ae4 \ - --hash=sha256:683155f44f373aa72eba0ea74dd324d688881de65984e9ca391ca1ec10aee6ed +aws-lambda-builders==1.49.0 \ + --hash=sha256:49fd4a313b9b5da9686b07b190939cf0d6863edd3f06f511ba91cc45c131fb19 \ + --hash=sha256:7387247f45effc8104b32ae00176340593577e09c5f6d8e381ef2f8f03b666a5 # via aws-sam-cli (setup.py) aws-sam-translator==1.87.0 \ --hash=sha256:40cef8980d656107406dafe30aef34b67be33929d2b9492e93f8e9ce07ece1c1 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 9132a8488e..c71af0d377 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --allow-unsafe --generate-hashes --output-file=requirements/reproducible-mac.txt @@ -20,9 +20,9 @@ attrs==23.2.0 \ # jsonschema # referencing # sarif-om -aws-lambda-builders==1.48.0 \ - --hash=sha256:01a2f41a49c118066a05428a924f08b65112565b155e43beb980517a6d295ae4 \ - --hash=sha256:683155f44f373aa72eba0ea74dd324d688881de65984e9ca391ca1ec10aee6ed +aws-lambda-builders==1.49.0 \ + --hash=sha256:49fd4a313b9b5da9686b07b190939cf0d6863edd3f06f511ba91cc45c131fb19 \ + --hash=sha256:7387247f45effc8104b32ae00176340593577e09c5f6d8e381ef2f8f03b666a5 # via aws-sam-cli (setup.py) aws-sam-translator==1.87.0 \ --hash=sha256:40cef8980d656107406dafe30aef34b67be33929d2b9492e93f8e9ce07ece1c1 \ @@ -30,24 +30,6 @@ aws-sam-translator==1.87.0 \ # via # aws-sam-cli (setup.py) # cfn-lint -backports-zoneinfo==0.2.1 \ - --hash=sha256:17746bd546106fa389c51dbea67c8b7c8f0d14b5526a579ca6ccf5ed72c526cf \ - --hash=sha256:1b13e654a55cd45672cb54ed12148cd33628f672548f373963b0bff67b217328 \ - --hash=sha256:1c5742112073a563c81f786e77514969acb58649bcdf6cdf0b4ed31a348d4546 \ - --hash=sha256:4a0f800587060bf8880f954dbef70de6c11bbe59c673c3d818921f042f9954a6 \ - --hash=sha256:5c144945a7752ca544b4b78c8c41544cdfaf9786f25fe5ffb10e838e19a27570 \ - --hash=sha256:7b0a64cda4145548fed9efc10322770f929b944ce5cee6c0dfe0c87bf4c0c8c9 \ - --hash=sha256:8439c030a11780786a2002261569bdf362264f605dfa4d65090b64b05c9f79a7 \ - --hash=sha256:8961c0f32cd0336fb8e8ead11a1f8cd99ec07145ec2931122faaac1c8f7fd987 \ - --hash=sha256:89a48c0d158a3cc3f654da4c2de1ceba85263fafb861b98b59040a5086259722 \ - --hash=sha256:a76b38c52400b762e48131494ba26be363491ac4f9a04c1b7e92483d169f6582 \ - --hash=sha256:da6013fd84a690242c310d77ddb8441a559e9cb3d3d59ebac9aca1a57b2e18bc \ - --hash=sha256:e55b384612d93be96506932a786bbcde5a2db7a9e6a4bb4bffe8b733f5b9036b \ - --hash=sha256:e81b76cace8eda1fca50e345242ba977f9be6ae3945af8d46326d776b4cf78d1 \ - --hash=sha256:e8236383a20872c0cdf5a62b554b27538db7fa1bbec52429d8d106effbaeca08 \ - --hash=sha256:f04e857b59d9d1ccc39ce2da1021d196e47234873820cbeaad210724b1ee28ac \ - --hash=sha256:fadbfe37f74051d024037f223b8e001611eac868b5c5b06144ef4d8b799862f2 - # via tzlocal binaryornot==0.4.4 \ --hash=sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061 \ --hash=sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4 @@ -299,16 +281,6 @@ idna==3.7 \ --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 # via requests -importlib-metadata==7.1.0 \ - --hash=sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570 \ - --hash=sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2 - # via flask -importlib-resources==6.4.0 \ - --hash=sha256:50d10f043df931902d4194ea07ec57960f66a80449ff867bfe782b4c486ba78c \ - --hash=sha256:cdb2b453b8046ca4e3798eb1d84f3cce1446a0e8e7b5ef4efb600f19fc398145 - # via - # jsonschema - # jsonschema-specifications itsdangerous==2.2.0 \ --hash=sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef \ --hash=sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173 @@ -503,10 +475,6 @@ pbr==6.0.0 \ # via # jschema-to-python # sarif-om -pkgutil-resolve-name==1.3.10 \ - --hash=sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174 \ - --hash=sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e - # via jsonschema pycparser==2.22 \ --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \ --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc @@ -982,28 +950,10 @@ typing-extensions==4.11.0 \ --hash=sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0 \ --hash=sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a # via - # annotated-types # aws-sam-cli (setup.py) # aws-sam-translator - # boto3-stubs - # botocore-stubs - # mypy-boto3-apigateway - # mypy-boto3-cloudformation - # mypy-boto3-ecr - # mypy-boto3-iam - # mypy-boto3-kinesis - # mypy-boto3-lambda - # mypy-boto3-s3 - # mypy-boto3-schemas - # mypy-boto3-secretsmanager - # mypy-boto3-signer - # mypy-boto3-sqs - # mypy-boto3-stepfunctions - # mypy-boto3-sts - # mypy-boto3-xray # pydantic # pydantic-core - # rich tzlocal==5.2 \ --hash=sha256:49816ef2fe65ea8ac19d19aa7a1ae0551c834303d5014c6d5a62e4cbda8047b8 \ --hash=sha256:8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e @@ -1056,12 +1006,6 @@ wheel==0.43.0 \ --hash=sha256:465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85 \ --hash=sha256:55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81 # via aws-lambda-builders -zipp==3.18.1 \ - --hash=sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b \ - --hash=sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: setuptools==69.5.1 \