Merge branch 'main' into dl-async

Author: taeold

.github/workflows/conformance.yml

@@ -10,10 +10,16 @@ permissions: read-all
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['3.9', '3.10', '3.11', '3.12']
+        platform: [ubuntu-latest]
+        include:
+          - platform: ubuntu-22.04
+            python: '3.8'
+          - platform: ubuntu-22.04
+            python: '3.7'
+    runs-on: ${{ matrix.platform }}
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1

.github/workflows/unit.yml

@@ -1,5 +1,5 @@
 name: Python Unit CI
-on: 
+on:
   push:
     branches:
       - main
@@ -13,22 +13,31 @@ jobs:
       matrix:
         python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        # Python <= 3.9 is not available on macos-14
+        # Python <= 3.9 is not available on macos-latest
         # Workaround for https://github.com/actions/setup-python/issues/696
+        # Python <= 3.8 is not available on ubuntu-latest
         exclude:
         - platform: macos-latest
           python: '3.9'
         - platform: macos-latest
           python: '3.8'
         - platform: macos-latest
           python: '3.7'
+        - platform: ubuntu-latest
+          python: '3.8'
+        - platform: ubuntu-latest
+          python: '3.7'
         include:
         - platform: macos-latest
           python: '3.9'
         - platform: macos-13
           python: '3.8'
         - platform: macos-13
           python: '3.7'
+        - platform: ubuntu-22.04
+          python: '3.8'
+        - platform: ubuntu-22.04
+          python: '3.7'
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Harden Runner
@@ -39,7 +48,9 @@ jobs:
         allowed-endpoints: >
           auth.docker.io:443
           files.pythonhosted.org:443
+          api.github.com:443
           github.com:443
+          objects.githubusercontent.com:443
           production.cloudflare.docker.com:443
           pypi.org:443
           registry-1.docker.io:443

DEVELOPMENT.md

@@ -0,0 +1,55 @@
+# Development
+
+Quickstart for functions-framework maintainers.
+
+## Environment setup
+
+Install [tox](https://pypi.org/p/tox), the test runner:
+
+```
+$ python -m pip install -U tox
+```
+
+## Running linting
+
+Linting can be run with:
+
+```
+$ python -m tox -e lint
+```
+
+## Running tests
+
+All tests can be run with:
+
+```
+$ python -m tox
+```
+
+Tests for the current Python version can be run with:
+
+```
+$ python -m tox -e py
+```
+
+Tests for a specific Python version can be run with:
+
+```
+$ python -m tox -e py3.12
+```
+
+A specific test file (e.g. `tests/test_cli.py`) can be run with:
+
+```
+$ python -m tox -e py -- tests/test_cli.py
+```
+
+A specific test in the file (e.g. `test_cli_no_arguements` in `tests/test_cli.py`) can be run with:
+
+```
+$ python -m tox -e py -- tests/test_cli.py::test_cli_no_arguments
+```
+
+## Releasing
+
+Releases are triggered via the [Release Please](https://github.com/apps/release-please) app, which in turn kicks off the [Release to PyPI](https://github.com/GoogleCloudPlatform/functions-framework-python/blob/main/.github/workflows/release.yml) workflow.

tox.ini

@@ -1,5 +1,24 @@
 [tox]
-envlist = py{35,36,37,38,39,310}-{ubuntu-latest,macos-latest,windows-latest},lint
+envlist =
+    lint
+    py312-ubuntu-latest
+    py312-macos-latest
+    py312-windows-latest
+    py311-ubuntu-latest
+    py311-macos-latest
+    py311-windows-latest
+    py310-ubuntu-latest
+    py310-macos-latest
+    py310-windows-latest
+    py39-ubuntu-latest
+    py39-macos-13
+    py39-windows-latest
+    py38-ubuntu-22.04
+    py38-macos-13
+    py38-windows-latest
+    py37-ubuntu-22.04
+    py37-macos-13
+    py37-windows-latest
 
 [testenv]
 usedevelop = true
@@ -22,10 +41,11 @@ deps =
     twine
     isort
     mypy
+    build
 extras = async
 commands =
     black --check src tests setup.py conftest.py --exclude tests/test_functions/background_load_error/main.py
     isort -c src tests setup.py conftest.py
     mypy tests/test_typing.py
-    python setup.py --quiet sdist bdist_wheel
+    python -m build
     twine check dist/*