Merge branch 'beeware:main' into date-input-toga-web

beeware · Nov 10, 2023 · 7fc20d1 · 7fc20d1
2 parents 191d6e7 + 3113b1e
commit 7fc20d1
Show file tree

Hide file tree

Showing 722 changed files with 8,567 additions and 4,334 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,9 +91,8 @@ jobs:
         # The $(ls ...) shell expansion is done in the Github environment;
         # the value of TOGA_INSTALL_COMMAND will be a literal string,
         # without any shell expansions to perform
-        TOGA_INSTALL_COMMAND="python -m pip install ../$(ls core/dist/toga_core-*.whl)[dev] ../$(ls dummy/dist/toga_dummy-*.whl)" tox -e py-core
-        cd core
-        mv .coverage .coverage.${{ matrix.platform }}.${{ matrix.python-version }}
+        TOGA_INSTALL_COMMAND="python -m pip install ../$(ls core/dist/toga_core-*.whl)[dev] ../$(ls dummy/dist/toga_dummy-*.whl)" tox -e py
+        mv core/.coverage core/.coverage.${{ matrix.platform }}.${{ matrix.python-version }}
     - name: Store coverage data
       uses: actions/upload-artifact@v3.1.3
       with:
@@ -128,64 +127,14 @@ jobs:
         cd core
         python -m coverage combine
         python -m coverage html --skip-covered --skip-empty
-        python -m coverage report --rcfile ../pyproject.toml # --fail-under=100
+        python -m coverage report --rcfile ../pyproject.toml --fail-under=100
     - name: Upload HTML report if check failed.
       uses: actions/upload-artifact@v3.1.3
       with:
         name: html-coverage-report
         path: core/htmlcov
       if: ${{ failure() }}
 
-  backend:
-    runs-on: ${{ matrix.runs-on }}
-    needs: [package, core]
-    strategy:
-      matrix:
-        backend: [ "android", "cocoa", "gtk", "iOS", "web", "winforms" ]
-        include:
-          - runs-on: ubuntu-latest
-          - python-version: "3.8"  # Should be env.min_python_version (https://github.com/actions/runner/issues/480)
-          - pre-command:
-
-          - backend: cocoa
-            runs-on: macos-latest
-
-          - backend: gtk
-            pre-command: |
-              sudo apt update -y
-              sudo apt install -y pkg-config python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-gtk-3.0
-
-          - backend: iOS
-            runs-on: macos-latest
-
-          - backend: winforms
-            runs-on: windows-latest
-            # Py3.9 is the first Python version for which
-            # a wheel of pythonnet isn't available on PyPI.
-            python-version: "3.9"
-    steps:
-    - uses: actions/checkout@v4.1.1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4.7.1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Get packages
-      uses: actions/download-artifact@v3.0.2
-      with:
-        name: ${{ needs.package.outputs.artifact-name }}
-    - name: Install dev dependencies
-      run: |
-        ${{ matrix.pre-command }}
-        # We don't actually want to install toga-core;
-        # we just want the dev extras so we have a known version of tox
-        python -m pip install ./core[dev]
-    - name: Test
-      run: |
-        # The $(ls ...) shell expansion is done in the Github environment;
-        # the value of TOGA_INSTALL_COMMAND will be a literal string,
-        # without any shell expansions to perform
-        TOGA_INSTALL_COMMAND="python -m pip install ../$(ls core/dist/toga_core-*.whl)[dev] ../$(ls dummy/dist/toga_dummy-*.whl) ../$(ls ${{ matrix.backend }}/dist/toga_${{ matrix.backend }}-*.whl)" tox -e py-${{ matrix.backend }}
-
   testbed:
     runs-on: ${{ matrix.runs-on }}
     needs: core
@@ -288,3 +237,11 @@ jobs:
       with:
         name: testbed-failure-app-data-${{ matrix.backend }}
         path: testbed/app_data/*
+    # This step is only needed if you're trying to diagnose test failures that
+    # only occur in CI, and can't be reproduced locally. When it runs, it will
+    # open an SSH server (URL reported in the logs) so you can ssh into the CI
+    # machine.
+    # - uses: actions/checkout@v3
+    # - name: Setup tmate session
+    #   uses: mxschmitt/action-tmate@v3
+    #   if: failure()
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,9 +9,17 @@ jobs:
   ci:
     uses: ./.github/workflows/ci.yml
 
+  docs:
+    name: Verify Docs Build
+    uses: beeware/.github/.github/workflows/docs-build-verify.yml@main
+    secrets: inherit
+    with:
+      project-name: "toga"
+      project-version: ${{ github.ref_name }}
+
   release:
     name: Create GitHub release
-    needs: ci
+    needs: [ ci, docs ]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -68,4 +76,4 @@ jobs:
       - name: Publish to TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          repository_url: https://test.pypi.org/legacy/
+          repository-url: https://test.pypi.org/legacy/
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 coverage.xml
 dist
 build
+logs
 _build
 distribute-*
 docs/env

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/psf/black
-    rev: 23.10.0
+    rev: 23.10.1
     hooks:
     - id: black
   - repo: https://github.com/PyCQA/flake8

diff --git a/android/setup.cfg b/android/setup.cfg
@@ -12,7 +12,7 @@ author_email = russell@keith-magee.com
 maintainer = BeeWare Team
 maintainer_email = team@beeware.org
 classifiers =
-    Development Status :: 3 - Alpha
+    Development Status :: 4 - Beta
     Intended Audience :: Developers
     License :: OSI Approved :: BSD License
     Operating System :: OS Independent