Merge branch 'master' into feature/lambda_qualifier

Author: monkut

.github/ISSUE_TEMPLATE.md

@@ -1,28 +1,37 @@
 <!--- Provide a general summary of the issue in the Title above -->
+
 ## Context
+
 <!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
-<!--- Also, please make sure that you are running Zappa _from a virtual environment_ and are using Python 3.8/3.9/3.10/3.11/3.12 -->
+<!--- Also, please make sure that you are running Zappa _from a virtual environment_ and are using Python 3.8/3.9/3.10/3.11/3.12/3.13 -->
 
 ## Expected Behavior
+
 <!--- Tell us what should happen -->
 
 ## Actual Behavior
+
 <!--- Tell us what happens instead -->
 
 ## Possible Fix
+
 <!--- Not obligatory, but suggest a fix or reason for the bug -->
 
 ## Steps to Reproduce
+
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
 <!--- reproduce this bug include code to reproduce, if relevant -->
+
 1.
 2.
 3.
 
 ## Your Environment
+
 <!--- Include as many relevant details about the environment you experienced the bug in -->
-* Zappa version used:
-* Operating System and Python version:
-* The output of `pip freeze`:
-* Link to your project (optional):
-* Your `zappa_settings.json`: 
+
+- Zappa version used:
+- Operating System and Python version:
+- The output of `pip freeze`:
+- Link to your project (optional):
+- Your `zappa_settings.json`:

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,7 +20,7 @@ Before you submit this PR, please make sure that you meet these criteria:
 
 * Did you **make sure this code actually works on Lambda**, as well as locally?
 
-* Did you test this code with all of: **Python 3.8**, **Python 3.9**, **Python 3.10**, **Python 3.11**, and **Python 3.12**?
+* Did you test this code with all of: **Python 3.8**, **Python 3.9**, **Python 3.10**, **Python 3.11**, **Python 3.12**, and **Python 3.13**?
 
 * Does this commit ONLY relate to the issue at hand and have your linter shit all over the code?
 
@@ -31,9 +31,10 @@ Thank you for your contribution!
 -->
 
 ## Description
-<!-- Please describe the changes included in this PR --> 
+
+<!-- Please describe the changes included in this PR -->
 
 ## GitHub Issues
+
 <!-- Proposed changes should be discussed in an issue before submitting a PR. -->
 <!-- Link to relevant tickets here. -->
-

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on:  # yamllint disable-line rule:truthy
+on: # yamllint disable-line rule:truthy
   pull_request:
     branches: ["master"]
   push:
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout Code Repository
         uses: actions/checkout@v4
@@ -26,29 +26,34 @@ jobs:
           restore-keys: ${{ runner.os }}-pip${{ matrix.python }}-
       - name: make sure we have version tags
         run: git fetch --unshallow --tags
-      - name: Setup Virtualenv
-        run: python -m venv .venv
-      - name: Install
-        run: source .venv/bin/activate && make requirements && python setup.py install
-      - name: Lint
-        run: source .venv/bin/activate && make flake black-check isort-check
+      - name: Install pipenv
+        run: python -m pip install --upgrade pip pipenv
+      - name: Setup/install dependencies (pipenv)
+        run: python -m pipenv install --dev
+      - name: Lint (flake/black/isort)
+        run: pipenv run make flake black-check isort-check
       - name: Test
-        run: source .venv/bin/activate && make tests
-      - name: Upload Coverage
-        run: .venv/bin/coveralls --service=github
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_FLAG_NAME: py${{ matrix.python }}
-          COVERALLS_PARALLEL: true
-          COVERALLS_SERVICE_JOB_ID: ${{ github.run_id }}
+        run: pipenv run make tests
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: py${{ matrix.python }}
+          parallel: true
+          format: cobertura
+          debug: true
 
   coverage:
     needs: test
     runs-on: ubuntu-latest
     steps:
       - name: Set up Python
         uses: actions/setup-python@v5
-      - name: Finalise Coverage
-        run: pip3 install --upgrade coveralls && coveralls --service=github --finish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
+          format: cobertura
+          carryforward: "run-3.9,run-3.10,run-3.11,run-3.12,run-3.13"
+          debug: true

.gitignore

@@ -262,5 +262,6 @@ Temporary Items
 ##########################
 
 *.zip
+*-slim-handler-*.tar.gz
 README.test.md
 zappa_settings.json

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
     -   id: isort
         args: [--profile=black, --gitignore]
 -   repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.8.0
     hooks:
     -   id: black
         args: [--line-length=127]

Makefile

@@ -91,6 +91,7 @@ tests:
 		tests/tests_async.py \
 		tests/tests.py \
 		tests/tests_utilities.py \
-		--cov=zappa
+		--cov=zappa \
+		--cov-report=xml \
 		--durations=0
 

Pipfile

@@ -4,10 +4,10 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-black = "==24.1.1"
+black = "==24.8.0"
 boto3-stubs = "*"
 coveralls = "*"
-Django = "<4"
+django = ">=4.2,<6"
 django-stubs = "*"
 flake8 = "==7.0.0"
 Flask = "*"
@@ -18,6 +18,7 @@ packaging = "*"
 pre-commit = "*"
 pytest = "*"
 pytest-cov = "*"
+legacy-cgi = "*"
 
 [packages]
 argcomplete = "*"
@@ -26,20 +27,18 @@ durationpy = "*"
 hjson = "*"
 jmespath = "*"
 kappa = "==0.6.0"
-pip = ">=9.0.1"
-# Workaround until tests are updated to work with 'placebo' 0.10
-# Move to 'dev-packages' when unpinned
+pip = ">=24.0.0"
 placebo = "<0.10"
 python-dateutil = "*"
 python-slugify = "*"
 PyYAML = "*"
-# previous versions don't work with urllib3 1.24
-requests = ">=2.20.0"
+requests = ">=2.32.0"
 toml = "*"
-tqdm = "*"
+tqdm = ">=4.66.3"
 troposphere = ">=3.0"
 Werkzeug = "*"
 wheel = "*"
+setuptools = "<80.0.0"
 
 [pipenv]
 allow_prereleases = false

README.md

@@ -80,6 +80,9 @@
   - [Endpoint Configuration](#endpoint-configuration)
     - [Example Private API Gateway configuration](#example-private-api-gateway-configuration)
   - [Cold Starts (Experimental)](#cold-starts-experimental)
+  - [Lambda Test Console Usage](#lambda-test-console-usage)
+    - [`raw_command`](#raw_command)
+    - [`manage`](#manage)
 - [Zappa Guides](#zappa-guides)
 - [Zappa in the Press](#zappa-in-the-press)
 - [Sites Using Zappa](#sites-using-zappa)
@@ -133,7 +136,7 @@ And finally, Zappa is **super easy to use**. You can deploy your application wit
 
 ## Installation and Configuration
 
-_Before you begin, make sure you are running Python 3.8/3.9/3.10/3.11/3.12 and you have a valid AWS account and your [AWS credentials file](https://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs) is properly installed._
+_Before you begin, make sure you are running Python 3.8/3.9/3.10/3.11/3.12/3.13 and you have a valid AWS account and your [AWS credentials file](https://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs) is properly installed._
 
 **Zappa** can easily be installed through pip, like so:
 
@@ -444,7 +447,7 @@ For instance, suppose you have a basic application in a file called "my_app.py",
 
 Any remote print statements made and the value the function returned will then be printed to your local console. **Nifty!**
 
-You can also invoke interpretable Python 3.8/3.9/3.10/3.11/3.12 strings directly by using `--raw`, like so:
+You can also invoke interpretable Python 3.8/3.9/3.10/3.11/3.12/3.13 strings directly by using `--raw`, like so:
 
     $ zappa invoke production "print(1 + 2 + 3)" --raw
 
@@ -848,7 +851,7 @@ Example:
 
 ```python
 from zappa.asynchronous import task, get_async_response
-from flask import Flask, make_response, abort, url_for, redirect, request, jsonify
+from flask import Flask, abort, url_for, redirect, request, jsonify
 from time import sleep
 
 app = Flask(__name__)
@@ -905,6 +908,7 @@ to change Zappa's behavior. Use these at your own risk!
         "assume_policy": "my_assume_policy.json", // optional, IAM assume policy JSON file
         "attach_policy": "my_attach_policy.json", // optional, IAM attach policy JSON file
         "apigateway_policy": "my_apigateway_policy.json", // optional, API Gateway resource policy JSON file
+        "architecture": "x86_64", // optional, Set Lambda Architecture, defaults to x86_64. For Graviton 2 use: arm64
         "async_source": "sns", // Source of async tasks. Defaults to "lambda"
         "async_resources": true, // Create the SNS topic and DynamoDB table to use. Defaults to true.
         "async_response_table": "your_dynamodb_table_name",  // the DynamoDB table name to use for captured async responses; defaults to None (can't capture)
@@ -1003,7 +1007,7 @@ to change Zappa's behavior. Use these at your own risk!
         "role_name": "MyLambdaRole", // Name of Zappa execution role. Default <project_name>-<env>-ZappaExecutionRole. To use a different, pre-existing policy, you must also set manage_roles to false.
         "role_arn": "arn:aws:iam::12345:role/app-ZappaLambdaExecutionRole", // ARN of Zappa execution role. Default to None. To use a different, pre-existing policy, you must also set manage_roles to false. This overrides role_name. Use with temporary credentials via GetFederationToken.
         "route53_enabled": true, // Have Zappa update your Route53 Hosted Zones when certifying with a custom domain. Default true.
-        "runtime": "python3.12", // Python runtime to use on Lambda. Can be one of: "python3.8", "python3.9", "python3.10", "python3.11", or "python3.12". Defaults to whatever the current Python being used is.
+        "runtime": "python3.13", // Python runtime to use on Lambda. Can be one of: "python3.8", "python3.9", "python3.10", "python3.11", "python3.12", or "python3.13". Defaults to whatever the current Python being used is.
         "s3_bucket": "dev-bucket", // Zappa zip bucket,
         "slim_handler": false, // Useful if project >50M. Set true to just upload a small handler to Lambda and load actual project from S3 at runtime. Default false.
         "snap_start": "PublishedVersions", // Enable Lambda SnapStart for faster cold starts. Can be "PublishedVersions" or "None". Default "None".
@@ -1531,6 +1535,37 @@ apigateway_resource_policy.json:
 
 Lambda may provide additional resources than provisioned during cold start initialization. Set `INSTANTIATE_LAMBDA_HANDLER_ON_IMPORT=True` to instantiate the lambda handler on import. This is an experimental feature - if startup time is critical, look into using Provisioned Concurrency.
 
+### Lambda Test Console Usage
+
+The zappa lambda handler allows zappa commands can be initiated from the Lambda Test Console by providing the associated JSON payload.
+
+#### `raw_command`
+
+`raw_command` allows you to execute arbitrary python code in the context of your Zappa application. 
+This is useful for testing or debugging purposes.
+
+> **Warning**: This is a powerful feature and should be used with caution. 
+> It can execute any code in your application context, including potentially harmful commands.
+
+Example:
+```json
+{
+    "raw_command": "from myapp import my_function;x = my_function();print(x)"
+}
+```
+
+#### `manage`
+
+Django `manage` commands are also supported. 
+You can run any Django management command using the `manage` key in the payload.
+
+Example:
+```json
+{
+    "manage": "migrate"
+}
+```
+
 ## Zappa Guides
 
 - [Django-Zappa tutorial (screencast)](https://www.youtube.com/watch?v=plUrbPN0xc8&feature=youtu.be).

setup.py

@@ -14,47 +14,40 @@
 required = [
     "{}{}".format(name, version.strip('"')) if version != '"*"' else name for name, version in pipfile["packages"].items()
 ]
-test_required = [
-    "{}{}".format(name, version.strip('"')) if version != '"*"' else name for name, version in pipfile["dev-packages"].items()
-]
 
 setup(
     name="zappa",
     version=__version__,
     packages=["zappa"],
     install_requires=required,
-    python_requires=">=3.8",
-    tests_require=test_required,
+    python_requires=">=3.9",
     include_package_data=True,
     license="MIT License",
     description="Server-less Python Web Services for AWS Lambda and API Gateway",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://zappa.ws/zappa",
+    url="https://github.com/zappa/Zappa",
     author="Rich Jones",
     author_email="[email protected]",
-    maintainer="Alex DelVecchio",
-    maintainer_email="[email protected]",
     entry_points={
         "console_scripts": [
             "zappa=zappa.cli:handle",
             "z=zappa.cli:handle",
-        ]
+        ],
     },
     classifiers=[
         "Environment :: Console",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Framework :: Django",
-        "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.2",
-        "Framework :: Django :: 5.0",
+        "Framework :: Django :: 5.2",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     ],

test_settings.json

@@ -142,5 +142,19 @@
        "delete_local_zip": true,
        "binary_support": true,
        "additional_text_mimetypes": ["application/custommimetype"]
-    }
+    },
+    "arch_arm64": {
+        "s3_bucket": "lmbda",
+        "app_function": "tests.test_app.hello_world",
+        "delete_local_zip": true,
+        "debug": true,
+        "architecture": "arm64"
+     },
+     "archfail": {
+        "s3_bucket": "lmbda",
+        "app_function": "tests.test_app.hello_world",
+        "delete_local_zip": true,
+        "debug": true,
+        "architecture": "invalid_architecture"
+     }
 }