From f1bfd053abeba055831ee3a6e6ee477441469a33 Mon Sep 17 00:00:00 2001 From: Alexander Rashed Date: Tue, 13 Feb 2024 16:55:02 +0100 Subject: [PATCH 1/2] upgrade to python 3.12 --- .circleci/config.yml | 4 ++-- .github/workflows/asf-updates.yml | 4 ++-- .github/workflows/marker-report-issue.yml | 2 +- .github/workflows/marker-report.yml | 2 +- .github/workflows/tests-podman.yml | 2 +- .github/workflows/tests-pro-integration.yml | 4 ++-- .python-version | 2 +- Dockerfile | 6 +++--- Dockerfile.s3 | 8 ++++---- Makefile | 6 +++--- localstack/dev/run/paths.py | 2 +- pyproject.toml | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51c238d067410..c6b2274fd354d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,10 +3,10 @@ version: 2.1 parameters: ubuntu-amd64-machine-image: type: string - default: "ubuntu-2204:2023.02.1" + default: "ubuntu-2204:2024.01.1" ubuntu-arm64-machine-image: type: string - default: "ubuntu-2204:2023.02.1" + default: "ubuntu-2204:2024.01.1" skip_test_selection: type: boolean default: false diff --git a/.github/workflows/asf-updates.yml b/.github/workflows/asf-updates.yml index fd72300378ca4..68a582e106891 100644 --- a/.github/workflows/asf-updates.yml +++ b/.github/workflows/asf-updates.yml @@ -19,11 +19,11 @@ jobs: sudo apt-get update sudo apt-get install jq - - name: Set up Python 3.11 + - name: Set up Python 3.12 id: setup-python uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - name: Cache LocalStack community dependencies (venv) uses: actions/cache@v4 diff --git a/.github/workflows/marker-report-issue.yml b/.github/workflows/marker-report-issue.yml index c04b7e9ce5726..f85c984d8aba2 100644 --- a/.github/workflows/marker-report-issue.yml +++ b/.github/workflows/marker-report-issue.yml @@ -33,7 +33,7 @@ jobs: id: setup-python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" - name: Install dependencies run: make install-dev diff --git a/.github/workflows/marker-report.yml b/.github/workflows/marker-report.yml index aa1036e7e39b2..7376bbcdf4da9 100644 --- a/.github/workflows/marker-report.yml +++ b/.github/workflows/marker-report.yml @@ -23,7 +23,7 @@ jobs: id: setup-python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" - name: Cache LocalStack community dependencies (venv) uses: actions/cache@v4 diff --git a/.github/workflows/tests-podman.yml b/.github/workflows/tests-podman.yml index 0d9675f765633..f635d42f8f999 100644 --- a/.github/workflows/tests-podman.yml +++ b/.github/workflows/tests-podman.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" - name: Install podman and test dependencies run: | diff --git a/.github/workflows/tests-pro-integration.yml b/.github/workflows/tests-pro-integration.yml index 0a7cdda40b3a1..a1d10c3025090 100644 --- a/.github/workflows/tests-pro-integration.yml +++ b/.github/workflows/tests-pro-integration.yml @@ -192,11 +192,11 @@ jobs: token: ${{ secrets.PRO_ACCESS_TOKEN }} path: localstack-ext - - name: Set up Python 3.11 + - name: Set up Python 3.12 id: setup-python uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - name: Set up Node 18.x uses: actions/setup-node@v4 diff --git a/.python-version b/.python-version index 2c0733315e415..e4fba21835872 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.11 +3.12 diff --git a/Dockerfile b/Dockerfile index 13b85840a7dda..58ee086ba210b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ jdk.localedata --include-locales en,th \ # base: Stage which installs necessary runtime dependencies (OS packages, java,...) -FROM python:3.11.9-slim-bookworm@sha256:6d2502238109c929569ae99355e28890c438cb11bc88ef02cd189c173b3db07c as base +FROM python:3.12.3-slim-bookworm@sha256:2be8daddbb82756f7d1f2c7ece706aadcb284bf6ab6d769ea695cc3ed6016743 as base ARG TARGETARCH # Install runtime OS package dependencies @@ -192,9 +192,9 @@ RUN --mount=type=cache,target=/root/.cache \ chmod -R 777 /usr/lib/localstack # link the python package installer virtual environments into the localstack venv -RUN echo /var/lib/localstack/lib/python-packages/lib/python3.11/site-packages > localstack-var-python-packages-venv.pth && \ +RUN echo /var/lib/localstack/lib/python-packages/lib/python3.12/site-packages > localstack-var-python-packages-venv.pth && \ mv localstack-var-python-packages-venv.pth .venv/lib/python*/site-packages/ -RUN echo /usr/lib/localstack/python-packages/lib/python3.11/site-packages > localstack-static-python-packages-venv.pth && \ +RUN echo /usr/lib/localstack/python-packages/lib/python3.12/site-packages > localstack-static-python-packages-venv.pth && \ mv localstack-static-python-packages-venv.pth .venv/lib/python*/site-packages/ # expose edge service, external service ports, and debugpy diff --git a/Dockerfile.s3 b/Dockerfile.s3 index 359796d93f38a..7e1cbdbdf9c68 100644 --- a/Dockerfile.s3 +++ b/Dockerfile.s3 @@ -1,5 +1,5 @@ # base: Stage which installs necessary runtime dependencies (OS packages, filesystem...) -FROM python:3.11.9-slim-bookworm@sha256:6d2502238109c929569ae99355e28890c438cb11bc88ef02cd189c173b3db07c as base +FROM python:3.12.3-slim-bookworm@sha256:2be8daddbb82756f7d1f2c7ece706aadcb284bf6ab6d769ea695cc3ed6016743 as base ARG TARGETARCH # set workdir @@ -68,7 +68,7 @@ RUN . .venv/bin/activate && pip3 freeze -l > requirements-runtime.txt # delete the botocore specs for other services (>80mb) # TODO: well now it's compressed and it's much lighter: 20mb maybe not worth it -RUN find .venv/lib/python3.11/site-packages/botocore/data/ -mindepth 1 -maxdepth 1 -type d -not -name s3 -exec rm -rf '{}' \; +RUN find .venv/lib/python3.12/site-packages/botocore/data/ -mindepth 1 -maxdepth 1 -type d -not -name s3 -exec rm -rf '{}' \; # final stage: Builds upon base stage and copies resources from builder stages @@ -88,9 +88,9 @@ RUN make entrypoints # link the python package installer virtual environments into the localstack venv -RUN echo /var/lib/localstack/lib/python-packages/lib/python3.11/site-packages > localstack-var-python-packages-venv.pth && \ +RUN echo /var/lib/localstack/lib/python-packages/lib/python3.12/site-packages > localstack-var-python-packages-venv.pth && \ mv localstack-var-python-packages-venv.pth .venv/lib/python*/site-packages/ -RUN echo /usr/lib/localstack/python-packages/lib/python3.11/site-packages > localstack-static-python-packages-venv.pth && \ +RUN echo /usr/lib/localstack/python-packages/lib/python3.12/site-packages > localstack-static-python-packages-venv.pth && \ mv localstack-static-python-packages-venv.pth .venv/lib/python*/site-packages/ # expose edge service and debugpy diff --git a/Makefile b/Makefile index 7c668725e8968..076ccae6daf05 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,7 @@ docker-run: ## Run Docker image locally docker-mount-run: MOTO_DIR=$$(echo $$(pwd)/.venv/lib/python*/site-packages/moto | awk '{print $$NF}'); echo MOTO_DIR $$MOTO_DIR; \ - DOCKER_FLAGS="$(DOCKER_FLAGS) -v `pwd`/localstack/constants.py:/opt/code/localstack/localstack/constants.py -v `pwd`/localstack/config.py:/opt/code/localstack/localstack/config.py -v `pwd`/localstack/plugins.py:/opt/code/localstack/localstack/plugins.py -v `pwd`/localstack/plugin:/opt/code/localstack/localstack/plugin -v `pwd`/localstack/runtime:/opt/code/localstack/localstack/runtime -v `pwd`/localstack/utils:/opt/code/localstack/localstack/utils -v `pwd`/localstack/services:/opt/code/localstack/localstack/services -v `pwd`/localstack/http:/opt/code/localstack/localstack/http -v `pwd`/localstack/contrib:/opt/code/localstack/localstack/contrib -v `pwd`/tests:/opt/code/localstack/tests -v $$MOTO_DIR:/opt/code/localstack/.venv/lib/python3.11/site-packages/moto/" make docker-run + DOCKER_FLAGS="$(DOCKER_FLAGS) -v `pwd`/localstack/constants.py:/opt/code/localstack/localstack/constants.py -v `pwd`/localstack/config.py:/opt/code/localstack/localstack/config.py -v `pwd`/localstack/plugins.py:/opt/code/localstack/localstack/plugins.py -v `pwd`/localstack/plugin:/opt/code/localstack/localstack/plugin -v `pwd`/localstack/runtime:/opt/code/localstack/localstack/runtime -v `pwd`/localstack/utils:/opt/code/localstack/localstack/utils -v `pwd`/localstack/services:/opt/code/localstack/localstack/services -v `pwd`/localstack/http:/opt/code/localstack/localstack/http -v `pwd`/localstack/contrib:/opt/code/localstack/localstack/contrib -v `pwd`/tests:/opt/code/localstack/tests -v $$MOTO_DIR:/opt/code/localstack/.venv/lib/python3.12/site-packages/moto/" make docker-run docker-cp-coverage: @echo 'Extracting .coverage file from Docker image'; \ @@ -228,13 +228,13 @@ test-docker-mount: ## Run automated tests in Docker (mounting local code) # TODO: find a cleaner way to mount/copy the dependencies into the container... VENV_DIR=$$(pwd)/.venv/; \ PKG_DIR=$$(echo $$VENV_DIR/lib/python*/site-packages | awk '{print $$NF}'); \ - PKG_DIR_CON=/opt/code/localstack/.venv/lib/python3.11/site-packages; \ + PKG_DIR_CON=/opt/code/localstack/.venv/lib/python3.12/site-packages; \ echo "#!/usr/bin/env python" > /tmp/pytest.ls.bin; cat $$VENV_DIR/bin/pytest >> /tmp/pytest.ls.bin; chmod +x /tmp/pytest.ls.bin; \ DOCKER_FLAGS="-v `pwd`/tests:/opt/code/localstack/tests -v /tmp/pytest.ls.bin:/opt/code/localstack/.venv/bin/pytest -v $$PKG_DIR/deepdiff:$$PKG_DIR_CON/deepdiff -v $$PKG_DIR/ordered_set:$$PKG_DIR_CON/ordered_set -v $$PKG_DIR/py:$$PKG_DIR_CON/py -v $$PKG_DIR/pluggy:$$PKG_DIR_CON/pluggy -v $$PKG_DIR/iniconfig:$$PKG_DIR_CON/iniconfig -v $$PKG_DIR/jsonpath_ng:$$PKG_DIR_CON/jsonpath_ng -v $$PKG_DIR/packaging:$$PKG_DIR_CON/packaging -v $$PKG_DIR/pytest:$$PKG_DIR_CON/pytest -v $$PKG_DIR/pytest_httpserver:$$PKG_DIR_CON/pytest_httpserver -v $$PKG_DIR/_pytest:$$PKG_DIR_CON/_pytest -v $$PKG_DIR/_pytest:$$PKG_DIR_CON/orjson" make test-docker-mount-code test-docker-mount-code: PACKAGES_DIR=$$(echo $$(pwd)/.venv/lib/python*/site-packages | awk '{print $$NF}'); \ - DOCKER_FLAGS="$(DOCKER_FLAGS) --entrypoint= -v `pwd`/localstack/config.py:/opt/code/localstack/localstack/config.py -v `pwd`/localstack/constants.py:/opt/code/localstack/localstack/constants.py -v `pwd`/localstack/utils:/opt/code/localstack/localstack/utils -v `pwd`/localstack/services:/opt/code/localstack/localstack/services -v `pwd`/localstack/aws:/opt/code/localstack/localstack/aws -v `pwd`/Makefile:/opt/code/localstack/Makefile -v $$PACKAGES_DIR/moto:/opt/code/localstack/.venv/lib/python3.11/site-packages/moto/ -e TEST_PATH=\\'$(TEST_PATH)\\' -e LAMBDA_JAVA_OPTS=$(LAMBDA_JAVA_OPTS) $(ENTRYPOINT)" CMD="make test" make docker-run + DOCKER_FLAGS="$(DOCKER_FLAGS) --entrypoint= -v `pwd`/localstack/config.py:/opt/code/localstack/localstack/config.py -v `pwd`/localstack/constants.py:/opt/code/localstack/localstack/constants.py -v `pwd`/localstack/utils:/opt/code/localstack/localstack/utils -v `pwd`/localstack/services:/opt/code/localstack/localstack/services -v `pwd`/localstack/aws:/opt/code/localstack/localstack/aws -v `pwd`/Makefile:/opt/code/localstack/Makefile -v $$PACKAGES_DIR/moto:/opt/code/localstack/.venv/lib/python3.12/site-packages/moto/ -e TEST_PATH=\\'$(TEST_PATH)\\' -e LAMBDA_JAVA_OPTS=$(LAMBDA_JAVA_OPTS) $(ENTRYPOINT)" CMD="make test" make docker-run lint: ## Run code linter to check code style, check if formatter would make changes and check if dependency pins need to be updated ($(VENV_RUN); python -m ruff check --output-format=full . && python -m ruff format --check .) diff --git a/localstack/dev/run/paths.py b/localstack/dev/run/paths.py index a48a06a1d164e..96065838d7400 100644 --- a/localstack/dev/run/paths.py +++ b/localstack/dev/run/paths.py @@ -43,7 +43,7 @@ class ContainerPaths: """Important paths in the container""" project_dir: str = "/opt/code/localstack" - site_packages_target_dir: str = "/opt/code/localstack/.venv/lib/python3.11/site-packages" + site_packages_target_dir: str = "/opt/code/localstack/.venv/lib/python3.12/site-packages" docker_entrypoint: str = "/usr/local/bin/docker-entrypoint.sh" localstack_supervisor: str = "/usr/local/bin/localstack-supervisor" localstack_source_dir: str diff --git a/pyproject.toml b/pyproject.toml index 246449ec8cf67..3f8a03c84845e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ dynamic = ["version"] classifiers = [ "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "License :: OSI Approved :: Apache Software License", "Topic :: Internet", "Topic :: Software Development :: Testing", From deb6fba5632c82417cb2dbaf2b4b263740728051 Mon Sep 17 00:00:00 2001 From: Alexander Rashed Date: Tue, 13 Feb 2024 16:55:13 +0100 Subject: [PATCH 2/2] update pinned dependencies --- requirements-base-runtime.txt | 10 +-- requirements-basic.txt | 6 +- requirements-dev.txt | 24 +++--- requirements-runtime.txt | 18 ++--- requirements-test.txt | 24 +++--- requirements-typehint.txt | 133 +++++----------------------------- 6 files changed, 59 insertions(+), 156 deletions(-) diff --git a/requirements-base-runtime.txt b/requirements-base-runtime.txt index 7850a034b7b64..b3c634869a47d 100644 --- a/requirements-base-runtime.txt +++ b/requirements-base-runtime.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --extra=base-runtime --output-file=requirements-base-runtime.txt --strip-extras --unsafe-package=distribute --unsafe-package=localstack-core --unsafe-package=pip --unsafe-package=setuptools pyproject.toml @@ -40,7 +40,7 @@ click==8.1.7 # quart constantly==23.10.4 # via localstack-twisted -cryptography==42.0.5 +cryptography==42.0.6 # via # localstack-core (pyproject.toml) # pyopenssl @@ -85,7 +85,7 @@ itsdangerous==2.2.0 # via # flask # quart -jinja2==3.1.3 +jinja2==3.1.4 # via # flask # quart @@ -124,7 +124,7 @@ psutil==5.9.8 # via localstack-core (pyproject.toml) pycparser==2.22 # via cffi -pygments==2.17.2 +pygments==2.18.0 # via rich pyopenssl==24.1.0 # via @@ -180,7 +180,7 @@ urllib3==2.2.1 # requests websocket-client==1.8.0 # via docker -werkzeug==3.0.2 +werkzeug==3.0.3 # via # flask # localstack-core (pyproject.toml) diff --git a/requirements-basic.txt b/requirements-basic.txt index 05edf7f7d6c53..4372fd178dff7 100644 --- a/requirements-basic.txt +++ b/requirements-basic.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --output-file=requirements-basic.txt --strip-extras --unsafe-package=distribute --unsafe-package=localstack-core --unsafe-package=pip --unsafe-package=setuptools pyproject.toml @@ -16,7 +16,7 @@ charset-normalizer==3.3.2 # via requests click==8.1.7 # via localstack-core (pyproject.toml) -cryptography==42.0.5 +cryptography==42.0.6 # via localstack-core (pyproject.toml) dill==0.3.6 # via localstack-core (pyproject.toml) @@ -40,7 +40,7 @@ psutil==5.9.8 # via localstack-core (pyproject.toml) pycparser==2.22 # via cffi -pygments==2.17.2 +pygments==2.18.0 # via rich pyproject-hooks==1.1.0 # via build diff --git a/requirements-dev.txt b/requirements-dev.txt index 9cc0e643ba1ef..e44e3bd7414bd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --extra=dev --output-file=requirements-dev.txt --strip-extras --unsafe-package=distribute --unsafe-package=localstack-core --unsafe-package=pip --unsafe-package=setuptools pyproject.toml @@ -37,7 +37,7 @@ aws-cdk-asset-kubectl-v20==2.1.2 # via aws-cdk-lib aws-cdk-asset-node-proxy-agent-v6==2.0.3 # via aws-cdk-lib -aws-cdk-lib==2.139.1 +aws-cdk-lib==2.140.0 # via localstack-core aws-sam-translator==1.87.0 # via @@ -92,7 +92,7 @@ cffi==1.16.0 # via cryptography cfgv==3.4.0 # via pre-commit -cfn-lint==0.86.4 +cfn-lint==0.87.1 # via moto-ext charset-normalizer==3.3.2 # via requests @@ -102,7 +102,7 @@ click==8.1.7 # localstack-core # localstack-core (pyproject.toml) # quart -colorama==0.4.4 +colorama==0.4.6 # via awscli constantly==23.10.4 # via localstack-twisted @@ -116,7 +116,7 @@ coveralls==4.0.0 # via localstack-core (pyproject.toml) crontab==1.0.1 # via localstack-core -cryptography==42.0.5 +cryptography==42.0.6 # via # joserfc # localstack-core @@ -205,7 +205,7 @@ itsdangerous==2.2.0 # via # flask # quart -jinja2==3.1.3 +jinja2==3.1.4 # via # flask # moto-ext @@ -220,7 +220,7 @@ jpype1==1.5.0 # via localstack-core jschema-to-python==1.2.3 # via cfn-lint -jsii==1.97.0 +jsii==1.98.0 # via # aws-cdk-asset-awscli-v1 # aws-cdk-asset-kubectl-v20 @@ -246,7 +246,7 @@ jsonpickle==3.0.4 # via jschema-to-python jsonpointer==2.4 # via jsonpatch -jsonschema==4.21.1 +jsonschema==4.22.0 # via # aws-sam-translator # cfn-lint @@ -357,9 +357,9 @@ pydantic==2.7.1 # via aws-sam-translator pydantic-core==2.18.2 # via pydantic -pygments==2.17.2 +pygments==2.18.0 # via rich -pymongo==4.7.0 +pymongo==4.7.1 # via localstack-core pyopenssl==24.1.0 # via @@ -449,7 +449,7 @@ rsa==4.7.2 # via awscli rstr==3.2.2 # via localstack-core (pyproject.toml) -ruff==0.4.2 +ruff==0.4.3 # via localstack-core (pyproject.toml) s3transfer==0.10.1 # via @@ -515,7 +515,7 @@ websocket-client==1.8.0 # via # docker # localstack-core -werkzeug==3.0.2 +werkzeug==3.0.3 # via # flask # localstack-core diff --git a/requirements-runtime.txt b/requirements-runtime.txt index 6fdbffb48abc8..a6f6d9bcedf22 100644 --- a/requirements-runtime.txt +++ b/requirements-runtime.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --extra=runtime --output-file=requirements-runtime.txt --strip-extras --unsafe-package=distribute --unsafe-package=localstack-core --unsafe-package=pip --unsafe-package=setuptools pyproject.toml @@ -73,7 +73,7 @@ certifi==2024.2.2 # requests cffi==1.16.0 # via cryptography -cfn-lint==0.86.4 +cfn-lint==0.87.1 # via moto-ext charset-normalizer==3.3.2 # via requests @@ -83,13 +83,13 @@ click==8.1.7 # localstack-core # localstack-core (pyproject.toml) # quart -colorama==0.4.4 +colorama==0.4.6 # via awscli constantly==23.10.4 # via localstack-twisted crontab==1.0.1 # via localstack-core (pyproject.toml) -cryptography==42.0.5 +cryptography==42.0.6 # via # joserfc # localstack-core @@ -152,7 +152,7 @@ itsdangerous==2.2.0 # via # flask # quart -jinja2==3.1.3 +jinja2==3.1.4 # via # flask # moto-ext @@ -185,7 +185,7 @@ jsonpickle==3.0.4 # via jschema-to-python jsonpointer==2.4 # via jsonpatch -jsonschema==4.21.1 +jsonschema==4.22.0 # via # aws-sam-translator # cfn-lint @@ -265,9 +265,9 @@ pydantic==2.7.1 # via aws-sam-translator pydantic-core==2.18.2 # via pydantic -pygments==2.17.2 +pygments==2.18.0 # via rich -pymongo==4.7.0 +pymongo==4.7.1 # via localstack-core (pyproject.toml) pyopenssl==24.1.0 # via @@ -383,7 +383,7 @@ urllib3==2.2.1 # responses websocket-client==1.8.0 # via docker -werkzeug==3.0.2 +werkzeug==3.0.3 # via # flask # localstack-core diff --git a/requirements-test.txt b/requirements-test.txt index 92a07069b2070..17ac89d6895df 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --extra=test --output-file=requirements-test.txt --strip-extras --unsafe-package=distribute --unsafe-package=localstack-core --unsafe-package=pip --unsafe-package=setuptools pyproject.toml @@ -37,7 +37,7 @@ aws-cdk-asset-kubectl-v20==2.1.2 # via aws-cdk-lib aws-cdk-asset-node-proxy-agent-v6==2.0.3 # via aws-cdk-lib -aws-cdk-lib==2.139.1 +aws-cdk-lib==2.140.0 # via localstack-core (pyproject.toml) aws-sam-translator==1.87.0 # via @@ -90,7 +90,7 @@ certifi==2024.2.2 # requests cffi==1.16.0 # via cryptography -cfn-lint==0.86.4 +cfn-lint==0.87.1 # via moto-ext charset-normalizer==3.3.2 # via requests @@ -100,17 +100,17 @@ click==8.1.7 # localstack-core # localstack-core (pyproject.toml) # quart -colorama==0.4.4 +colorama==0.4.6 # via awscli constantly==23.10.4 # via localstack-twisted constructs==10.3.0 # via aws-cdk-lib -coverage==7.5.0 +coverage==7.5.1 # via localstack-core (pyproject.toml) crontab==1.0.1 # via localstack-core -cryptography==42.0.5 +cryptography==42.0.6 # via # joserfc # localstack-core @@ -189,7 +189,7 @@ itsdangerous==2.2.0 # via # flask # quart -jinja2==3.1.3 +jinja2==3.1.4 # via # flask # moto-ext @@ -204,7 +204,7 @@ jpype1==1.5.0 # via localstack-core jschema-to-python==1.2.3 # via cfn-lint -jsii==1.97.0 +jsii==1.98.0 # via # aws-cdk-asset-awscli-v1 # aws-cdk-asset-kubectl-v20 @@ -230,7 +230,7 @@ jsonpickle==3.0.4 # via jschema-to-python jsonpointer==2.4 # via jsonpatch -jsonschema==4.21.1 +jsonschema==4.22.0 # via # aws-sam-translator # cfn-lint @@ -328,9 +328,9 @@ pydantic==2.7.1 # via aws-sam-translator pydantic-core==2.18.2 # via pydantic -pygments==2.17.2 +pygments==2.18.0 # via rich -pymongo==4.7.0 +pymongo==4.7.1 # via localstack-core pyopenssl==24.1.0 # via @@ -476,7 +476,7 @@ websocket-client==1.8.0 # via # docker # localstack-core (pyproject.toml) -werkzeug==3.0.2 +werkzeug==3.0.3 # via # flask # localstack-core diff --git a/requirements-typehint.txt b/requirements-typehint.txt index 493acc613a122..d9e04171a4776 100644 --- a/requirements-typehint.txt +++ b/requirements-typehint.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --extra=typehint --output-file=requirements-typehint.txt --strip-extras --unsafe-package=distribute --unsafe-package=localstack-core --unsafe-package=pip --unsafe-package=setuptools pyproject.toml @@ -37,7 +37,7 @@ aws-cdk-asset-kubectl-v20==2.1.2 # via aws-cdk-lib aws-cdk-asset-node-proxy-agent-v6==2.0.3 # via aws-cdk-lib -aws-cdk-lib==2.139.1 +aws-cdk-lib==2.140.0 # via localstack-core aws-sam-translator==1.87.0 # via @@ -96,7 +96,7 @@ cffi==1.16.0 # via cryptography cfgv==3.4.0 # via pre-commit -cfn-lint==0.86.4 +cfn-lint==0.87.1 # via moto-ext charset-normalizer==3.3.2 # via requests @@ -106,7 +106,7 @@ click==8.1.7 # localstack-core # localstack-core (pyproject.toml) # quart -colorama==0.4.4 +colorama==0.4.6 # via awscli constantly==23.10.4 # via localstack-twisted @@ -120,7 +120,7 @@ coveralls==4.0.0 # via localstack-core crontab==1.0.1 # via localstack-core -cryptography==42.0.5 +cryptography==42.0.6 # via # joserfc # localstack-core @@ -209,7 +209,7 @@ itsdangerous==2.2.0 # via # flask # quart -jinja2==3.1.3 +jinja2==3.1.4 # via # flask # moto-ext @@ -224,7 +224,7 @@ jpype1==1.5.0 # via localstack-core jschema-to-python==1.2.3 # via cfn-lint -jsii==1.97.0 +jsii==1.98.0 # via # aws-cdk-asset-awscli-v1 # aws-cdk-asset-kubectl-v20 @@ -250,7 +250,7 @@ jsonpickle==3.0.4 # via jschema-to-python jsonpointer==2.4 # via jsonpatch -jsonschema==4.21.1 +jsonschema==4.22.0 # via # aws-sam-translator # cfn-lint @@ -333,11 +333,11 @@ mypy-boto3-dms==1.34.0 # via boto3-stubs mypy-boto3-docdb==1.34.77 # via boto3-stubs -mypy-boto3-dynamodb==1.34.91 +mypy-boto3-dynamodb==1.34.97 # via boto3-stubs mypy-boto3-dynamodbstreams==1.34.0 # via boto3-stubs -mypy-boto3-ec2==1.34.91 +mypy-boto3-ec2==1.34.97 # via boto3-stubs mypy-boto3-ecr==1.34.0 # via boto3-stubs @@ -409,7 +409,7 @@ mypy-boto3-mwaa==1.34.57 # via boto3-stubs mypy-boto3-neptune==1.34.0 # via boto3-stubs -mypy-boto3-opensearch==1.34.43 +mypy-boto3-opensearch==1.34.95 # via boto3-stubs mypy-boto3-organizations==1.34.56 # via boto3-stubs @@ -435,13 +435,13 @@ mypy-boto3-resourcegroupstaggingapi==1.34.0 # via boto3-stubs mypy-boto3-route53==1.34.31 # via boto3-stubs -mypy-boto3-route53resolver==1.34.15 +mypy-boto3-route53resolver==1.34.95 # via boto3-stubs mypy-boto3-s3==1.34.91 # via boto3-stubs mypy-boto3-s3control==1.34.83 # via boto3-stubs -mypy-boto3-sagemaker==1.34.89 +mypy-boto3-sagemaker==1.34.98 # via boto3-stubs mypy-boto3-sagemaker-runtime==1.34.0 # via boto3-stubs @@ -453,7 +453,7 @@ mypy-boto3-servicediscovery==1.34.89 # via boto3-stubs mypy-boto3-ses==1.34.0 # via boto3-stubs -mypy-boto3-sesv2==1.34.56 +mypy-boto3-sesv2==1.34.98 # via boto3-stubs mypy-boto3-sns==1.34.44 # via boto3-stubs @@ -553,9 +553,9 @@ pydantic==2.7.1 # via aws-sam-translator pydantic-core==2.18.2 # via pydantic -pygments==2.17.2 +pygments==2.18.0 # via rich -pymongo==4.7.0 +pymongo==4.7.1 # via localstack-core pyopenssl==24.1.0 # via @@ -645,7 +645,7 @@ rsa==4.7.2 # via awscli rstr==3.2.2 # via localstack-core -ruff==0.4.2 +ruff==0.4.3 # via localstack-core s3transfer==0.10.1 # via @@ -696,105 +696,8 @@ types-s3transfer==0.10.1 typing-extensions==4.11.0 # via # aws-sam-translator - # boto3-stubs # jsii # localstack-twisted - # mypy-boto3-acm - # mypy-boto3-acm-pca - # mypy-boto3-amplify - # mypy-boto3-apigateway - # mypy-boto3-apigatewayv2 - # mypy-boto3-appconfig - # mypy-boto3-appconfigdata - # mypy-boto3-application-autoscaling - # mypy-boto3-appsync - # mypy-boto3-athena - # mypy-boto3-autoscaling - # mypy-boto3-backup - # mypy-boto3-batch - # mypy-boto3-ce - # mypy-boto3-cloudcontrol - # mypy-boto3-cloudformation - # mypy-boto3-cloudfront - # mypy-boto3-cloudtrail - # mypy-boto3-cloudwatch - # mypy-boto3-codecommit - # mypy-boto3-cognito-identity - # mypy-boto3-cognito-idp - # mypy-boto3-dms - # mypy-boto3-docdb - # mypy-boto3-dynamodb - # mypy-boto3-dynamodbstreams - # mypy-boto3-ec2 - # mypy-boto3-ecr - # mypy-boto3-ecs - # mypy-boto3-efs - # mypy-boto3-eks - # mypy-boto3-elasticache - # mypy-boto3-elasticbeanstalk - # mypy-boto3-elbv2 - # mypy-boto3-emr - # mypy-boto3-emr-serverless - # mypy-boto3-es - # mypy-boto3-events - # mypy-boto3-firehose - # mypy-boto3-fis - # mypy-boto3-glacier - # mypy-boto3-glue - # mypy-boto3-iam - # mypy-boto3-identitystore - # mypy-boto3-iot - # mypy-boto3-iot-data - # mypy-boto3-iotanalytics - # mypy-boto3-iotwireless - # mypy-boto3-kafka - # mypy-boto3-kinesis - # mypy-boto3-kinesisanalytics - # mypy-boto3-kinesisanalyticsv2 - # mypy-boto3-kms - # mypy-boto3-lakeformation - # mypy-boto3-lambda - # mypy-boto3-logs - # mypy-boto3-managedblockchain - # mypy-boto3-mediaconvert - # mypy-boto3-mediastore - # mypy-boto3-mq - # mypy-boto3-mwaa - # mypy-boto3-neptune - # mypy-boto3-opensearch - # mypy-boto3-organizations - # mypy-boto3-pi - # mypy-boto3-pipes - # mypy-boto3-qldb - # mypy-boto3-qldb-session - # mypy-boto3-rds - # mypy-boto3-rds-data - # mypy-boto3-redshift - # mypy-boto3-redshift-data - # mypy-boto3-resource-groups - # mypy-boto3-resourcegroupstaggingapi - # mypy-boto3-route53 - # mypy-boto3-route53resolver - # mypy-boto3-s3 - # mypy-boto3-s3control - # mypy-boto3-sagemaker - # mypy-boto3-sagemaker-runtime - # mypy-boto3-secretsmanager - # mypy-boto3-serverlessrepo - # mypy-boto3-servicediscovery - # mypy-boto3-ses - # mypy-boto3-sesv2 - # mypy-boto3-sns - # mypy-boto3-sqs - # mypy-boto3-ssm - # mypy-boto3-sso-admin - # mypy-boto3-stepfunctions - # mypy-boto3-sts - # mypy-boto3-timestream-query - # mypy-boto3-timestream-write - # mypy-boto3-transcribe - # mypy-boto3-wafv2 - # mypy-boto3-xray # pydantic # pydantic-core # readerwriterlock @@ -812,7 +715,7 @@ websocket-client==1.8.0 # via # docker # localstack-core -werkzeug==3.0.2 +werkzeug==3.0.3 # via # flask # localstack-core