From b19b5095d044cd3a14e805969955ea3296ba74fb Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 16:03:01 +0100 Subject: [PATCH 01/19] Update workflows to use same approach as Briefcase --- .coveragerc | 11 ++++- .github/workflows/ci.yml | 87 ++++++++++++++++------------------- .github/workflows/publish.yml | 20 ++++++++ .github/workflows/release.yml | 37 +++++++++++++++ tox.ini | 21 ++++----- 5 files changed, 116 insertions(+), 60 deletions(-) create mode 100644 .github/workflows/publish.yml create mode 100644 .github/workflows/release.yml diff --git a/.coveragerc b/.coveragerc index 6d6e76a8dd..539bc897bb 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,8 +1,15 @@ [run] branch = True -source = src/core/toga +source_pkgs = toga omit = - src/core/toga/**/__init__.py + **/__init__.py + +[paths] +# Paths which may contain the packages listed in source_pkgs. The first path will be used +# to generate the filenames in the report. +source = + src/core + **/site-packages [report] show_missing = True diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d29f8491b3..5e804815e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,13 +4,20 @@ on: push: branches: - main + workflow_call: + +env: + min_python_version: "3.7" + +defaults: + run: + shell: bash # PowerShell doesn't stop after failed commands. jobs: beefore: name: Pre-test checks runs-on: ubuntu-latest strategy: - max-parallel: 4 matrix: task: - flake8 @@ -19,39 +26,51 @@ jobs: - package steps: - uses: actions/checkout@v1 - - name: Set up Python 3.7 - uses: actions/setup-python@v3.1.2 + - uses: actions/setup-python@v3.1.2 with: - python-version: "3.7" + python-version: ${{ env.min_python_version }} - name: Install dependencies run: | python -m pip install --upgrade pip python -m pip install --upgrade setuptools python -m pip install tox - - name: Run pre-test checks - run: | - tox -e ${{ matrix.task }} + - run: tox -e ${{ matrix.task }} + - if: matrix.task == "package" + uses: actions/upload-artifact@v3 + with: + name: packages + path: **/dist + if-no-files-found: error - smoke: - name: Smoke test (3.7) - needs: - - beefore - runs-on: ubuntu-latest + core: + needs: beefore + strategy: + matrix: + platform: ['macos', 'ubuntu', 'windows'] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] + runs-on: ${{ matrix.platform }}-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.7 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3.1.2 with: - python-version: "3.7" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip python -m pip install --upgrade setuptools python -m pip install --upgrade tox + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages + path: dist - name: Test + env: + TOGA_INSTALL_COMMAND: 'bash -c "pip install dist/toga_{core,dummy}*.whl"' run: | tox -e py - - name: Check coverage + - if: matrix.platform == "ubuntu" && matrix.python-version == env.min_python_version uses: codecov/codecov-action@v1 with: token: ${{ secrets.CODECOV_TOKEN }} @@ -59,35 +78,9 @@ jobs: flags: unittests fail_ci_if_error: true - python-versions: - # Only run this and subsequent steps on branches. - # `github.head_ref` only exists on pull requests. - if: github.head_ref - name: Python compatibility test - needs: smoke - runs-on: ubuntu-latest - strategy: - max-parallel: 4 - matrix: - python-version: ["3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3.1.2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install --upgrade tox - - name: Test - run: | - tox -e py - windows: name: Winforms backend tests - needs: python-versions + needs: core runs-on: windows-latest steps: - uses: actions/checkout@v1 @@ -116,7 +109,7 @@ jobs: macOS: name: macOS backend tests - needs: python-versions + needs: core runs-on: macOS-latest steps: - uses: actions/checkout@v1 @@ -139,7 +132,7 @@ jobs: iOS: name: iOS backend tests - needs: python-versions + needs: core runs-on: macOS-latest steps: - uses: actions/checkout@v1 @@ -162,7 +155,7 @@ jobs: gtk: name: GTK+ backend tests - needs: python-versions + needs: core runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 @@ -187,7 +180,7 @@ jobs: android: name: Android backend tests - needs: python-versions + needs: core runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -210,7 +203,7 @@ jobs: web: name: Web backend tests - needs: python-versions + needs: core runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000000..5afb41e0e6 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,20 @@ +name: Upload Python Package + +on: + release: + types: published + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: dsaltares/fetch-gh-release-asset@1.0.0 + with: + version: tags/${{ github.event.release.tag_name }} + file: ${{ github.event.repository.name }}.* + regex: true + target: dist/ + - name: Publish release to production PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + password: ${{ secrets.PYPI_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..d78facbd63 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,37 @@ +name: Create Release + +on: + push: + tags: + - 'v*' + +jobs: + ci: + uses: ./.github/workflows/ci.yml + release: + name: Create Release + needs: ci + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Set build variables + run: | + echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages + path: dist + - name: Create Release + uses: ncipollo/release-action@v1.11.1 + with: + name: ${{ env.VERSION }} + draft: true + artifacts: dist/* + artifactErrorsFailBuild: true + - name: Publish release to Test PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository_url: https://test.pypi.org/legacy/ + password: ${{ secrets.TEST_PYPI_PASSWORD }} diff --git a/tox.ini b/tox.ini index 377959d1de..3c3c1c1294 100644 --- a/tox.ini +++ b/tox.ini @@ -13,25 +13,26 @@ deps = setuptools pytest-tldr pytest-cov -changedir = {toxinidir} +# TOGA_INSTALL_COMMAND is set to a bash command by the CI workflow. +whitelist_externals = + bash commands: - python -m pip install -e src/core - python -m pip install -e src/dummy - pytest src/core/tests --cov --cov-report term-missing {posargs} + {env:TOGA_INSTALL_COMMAND:pip install -e src/core src/dummy} + # In CI, `--import-mode append` ensures we test the installed packages rather than the + # checked-out source code. + pytest src/core/tests --cov --cov-report term-missing --import-mode append {posargs} coverage xml [testenv:flake8] skip_install = True deps = flake8 -changedir = {toxinidir} commands = flake8 {posargs} # [testenv:towncrier-check] # skip_install = True # deps = # {[testenv:towncrier]deps} -# changedir = {toxinidir} # commands = # python -m towncrier.check @@ -39,7 +40,6 @@ commands = flake8 {posargs} # skip_install = True # deps = # towncrier >= 18.5.0 -# changedir = {toxinidir} # commands = # towncrier {posargs} @@ -48,7 +48,6 @@ skip_install = True deps = -r{toxinidir}/docs/requirements.txt src/core -changedir = {toxinidir} commands = python setup.py build_sphinx -W @@ -59,7 +58,7 @@ deps = wheel twine whitelist_externals = - release.sh -changedir = {toxinidir} + bash commands = - ./release.sh package + # Bash scripts can't be executed directly on Windows. + bash ./release.sh package From c1ba091d0254faaeee4b5d47dd73f6a317c636a8 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 17:15:47 +0100 Subject: [PATCH 02/19] Fix syntax errors --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e804815e6..62b77a1ccf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,11 +35,11 @@ jobs: python -m pip install --upgrade setuptools python -m pip install tox - run: tox -e ${{ matrix.task }} - - if: matrix.task == "package" + - if: matrix.task == 'package' uses: actions/upload-artifact@v3 with: name: packages - path: **/dist + path: "**/dist" if-no-files-found: error core: @@ -70,7 +70,7 @@ jobs: TOGA_INSTALL_COMMAND: 'bash -c "pip install dist/toga_{core,dummy}*.whl"' run: | tox -e py - - if: matrix.platform == "ubuntu" && matrix.python-version == env.min_python_version + - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version uses: codecov/codecov-action@v1 with: token: ${{ secrets.CODECOV_TOKEN }} From 8eeac516a4eed198b1fbd564544ff30321012fff Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 17:34:25 +0100 Subject: [PATCH 03/19] Handle artifact directory structure --- .github/workflows/ci.yml | 3 +-- .github/workflows/release.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62b77a1ccf..d15238ea3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,10 +64,9 @@ jobs: uses: actions/download-artifact@v3 with: name: packages - path: dist - name: Test env: - TOGA_INSTALL_COMMAND: 'bash -c "pip install dist/toga_{core,dummy}*.whl"' + TOGA_INSTALL_COMMAND: 'bash -c "pip install src/{core,dummy}/dist/*.whl"' run: | tox -e py - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d78facbd63..1704571e7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,13 +22,12 @@ jobs: uses: actions/download-artifact@v3 with: name: packages - path: dist - name: Create Release uses: ncipollo/release-action@v1.11.1 with: name: ${{ env.VERSION }} draft: true - artifacts: dist/* + artifacts: "**/dist/*" artifactErrorsFailBuild: true - name: Publish release to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 From e0234cf886cd42998bd0761ed7eb9d2d5afff61b Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 18:12:00 +0100 Subject: [PATCH 04/19] Merge backend tests into a matrix --- .github/workflows/ci.yml | 159 +++++++-------------------------------- 1 file changed, 28 insertions(+), 131 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d15238ea3f..94b5acd9a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,148 +77,45 @@ jobs: flags: unittests fail_ci_if_error: true - windows: - name: Winforms backend tests + backend: needs: core - runs-on: windows-latest + strategy: + matrix: + backend: [android, cocoa, gtk, iOS, web, winforms] + include: + - runs-on: ubuntu-latest + - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) + - pre-command: + - test-command: pytest + - backend: cocoa + runs-on: macos-latest + - backend: gtk + pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" + test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" + - 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" + runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v1 - - name: Set up Python 3.9 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3.1.2 with: # Py3.9 is the first Python version for which # a wheel of pythonnet isn't available on PyPI. - python-version: "3.9" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install pytest-tldr - python -m pip install -e src/core - python -m pip install -e src/dummy - python -m pip install -e src/winforms - - name: Test - run: | - cd src/winforms - pytest - - name: Core Test - run: | - cd src/core - pytest - - macOS: - name: macOS backend tests - needs: core - runs-on: macOS-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 - uses: actions/setup-python@v3.1.2 - with: - python-version: "3.7" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install pytest-tldr - python -m pip install -e src/core - python -m pip install -e src/dummy - python -m pip install -e src/cocoa - - name: Test - run: | - cd src/cocoa - pytest - - iOS: - name: iOS backend tests - needs: core - runs-on: macOS-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 - uses: actions/setup-python@v3.1.2 - with: - python-version: "3.7" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install pytest-tldr - python -m pip install -e src/core - python -m pip install -e src/dummy - python -m pip install -e src/iOS - - name: Test - run: | - cd src/iOS - pytest - - gtk: - name: GTK+ backend tests - needs: core - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 - uses: actions/setup-python@v3.1.2 - with: - python-version: "3.7" - - name: Install dependencies - run: | - sudo apt-get update -y - sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install pytest-tldr - python -m pip install -e src/core - python -m pip install -e src/dummy - python -m pip install -e src/gtk - - name: Test - run: | - cd src/gtk - xvfb-run -a -s '-screen 0 2048x1536x24' pytest - - android: - name: Android backend tests - needs: core - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 - uses: actions/setup-python@v3.1.2 - with: - python-version: "3.7" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install pytest-tldr - python -m pip install -e src/core - python -m pip install -e src/dummy - python -m pip install -e src/android - - name: Test - run: | - cd src/android - pytest - - web: - name: Web backend tests - needs: core - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 - uses: actions/setup-python@v3.1.2 - with: - python-version: "3.7" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | + ${{ matrix.pre-command }} python -m pip install --upgrade pip python -m pip install --upgrade setuptools python -m pip install pytest-tldr - python -m pip install -e src/core - python -m pip install -e src/dummy - python -m pip install -e src/web + python -m pip install -e src/{core,dummy,${{ matrix.backend }}}/dist/*.whl - name: Test run: | - cd src/web - pytest + cd src/${{ matrix.backend }} + ${{ matrix.test-command }} From 257ce64a5b63b2bc730d6b87eb39b82c450f3288 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 18:30:14 +0100 Subject: [PATCH 05/19] Add missing download-artifact step / Temporarily disable unit tests --- .github/workflows/ci.yml | 75 +++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94b5acd9a0..7de8100911 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,43 +42,44 @@ jobs: path: "**/dist" if-no-files-found: error - core: - needs: beefore - strategy: - matrix: - platform: ['macos', 'ubuntu', 'windows'] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] - runs-on: ${{ matrix.platform }}-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3.1.2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install --upgrade tox - - name: Get packages - uses: actions/download-artifact@v3 - with: - name: packages - - name: Test - env: - TOGA_INSTALL_COMMAND: 'bash -c "pip install src/{core,dummy}/dist/*.whl"' - run: | - tox -e py - - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version - uses: codecov/codecov-action@v1 - with: - token: ${{ secrets.CODECOV_TOKEN }} - file: ./coverage.xml - flags: unittests - fail_ci_if_error: true + # FIXME + # core: + # needs: beefore + # strategy: + # matrix: + # platform: ['macos', 'ubuntu', 'windows'] + # python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] + # runs-on: ${{ matrix.platform }}-latest + # steps: + # - uses: actions/checkout@v1 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v3.1.2 + # with: + # python-version: ${{ matrix.python-version }} + # - name: Install dependencies + # run: | + # python -m pip install --upgrade pip + # python -m pip install --upgrade setuptools + # python -m pip install --upgrade tox + # - name: Get packages + # uses: actions/download-artifact@v3 + # with: + # name: packages + # - name: Test + # env: + # TOGA_INSTALL_COMMAND: 'bash -c "pip install src/{core,dummy}/dist/*.whl"' + # run: | + # tox -e py + # - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version + # uses: codecov/codecov-action@v1 + # with: + # token: ${{ secrets.CODECOV_TOKEN }} + # file: ./coverage.xml + # flags: unittests + # fail_ci_if_error: true backend: - needs: core + needs: beefore # FIXME core strategy: matrix: backend: [android, cocoa, gtk, iOS, web, winforms] @@ -108,6 +109,10 @@ jobs: # Py3.9 is the first Python version for which # a wheel of pythonnet isn't available on PyPI. python-version: ${{ matrix.python-version }} + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages - name: Install dependencies run: | ${{ matrix.pre-command }} From fc609c96c5e4be30376a5b0b59780b5e6860fa48 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 18:34:18 +0100 Subject: [PATCH 06/19] Remove -e from pip command line --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de8100911..3bb3a58922 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,7 +119,7 @@ jobs: python -m pip install --upgrade pip python -m pip install --upgrade setuptools python -m pip install pytest-tldr - python -m pip install -e src/{core,dummy,${{ matrix.backend }}}/dist/*.whl + python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl - name: Test run: | cd src/${{ matrix.backend }} From cfd4f20bd528955b4a7e72d9cf211d6658dbf088 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 18:50:32 +0100 Subject: [PATCH 07/19] Bumped version number for v0.0.1rc1 release. --- demo/pyproject.toml | 12 ++++++------ demo/setup.cfg | 4 ++-- .../.template/{{ cookiecutter.name }}/pyproject.toml | 2 +- examples/activityindicator/pyproject.toml | 2 +- examples/beeliza/pyproject.toml | 2 +- examples/box/pyproject.toml | 2 +- examples/button/pyproject.toml | 2 +- examples/canvas/pyproject.toml | 2 +- examples/colors/pyproject.toml | 2 +- examples/command/pyproject.toml | 2 +- examples/date_and_time/pyproject.toml | 2 +- examples/detailedlist/pyproject.toml | 2 +- examples/dialogs/pyproject.toml | 2 +- examples/divider/pyproject.toml | 2 +- examples/examples_overview/pyproject.toml | 2 +- examples/focus/pyproject.toml | 2 +- examples/font/pyproject.toml | 2 +- examples/handlers/pyproject.toml | 2 +- examples/imageview/pyproject.toml | 2 +- examples/layout/pyproject.toml | 2 +- examples/multilinetextinput/pyproject.toml | 2 +- examples/numberinput/pyproject.toml | 2 +- examples/optioncontainer/pyproject.toml | 2 +- examples/positron-django/pyproject.toml | 2 +- examples/positron-static/pyproject.toml | 2 +- examples/progressbar/pyproject.toml | 2 +- examples/scrollcontainer/pyproject.toml | 2 +- examples/selection/pyproject.toml | 2 +- examples/slider/pyproject.toml | 2 +- examples/switch_demo/pyproject.toml | 2 +- examples/table/pyproject.toml | 2 +- examples/table_source/pyproject.toml | 2 +- examples/textinput/pyproject.toml | 2 +- examples/tree/pyproject.toml | 2 +- examples/tree_source/pyproject.toml | 2 +- examples/tutorial0/pyproject.toml | 2 +- examples/tutorial1/pyproject.toml | 2 +- examples/tutorial2/pyproject.toml | 2 +- examples/tutorial3/pyproject.toml | 2 +- examples/tutorial4/pyproject.toml | 2 +- examples/webview/pyproject.toml | 2 +- examples/window/pyproject.toml | 2 +- src/android/toga_android/__init__.py | 2 +- src/cocoa/toga_cocoa/__init__.py | 2 +- src/core/toga/__init__.py | 2 +- src/dummy/toga_dummy/__init__.py | 2 +- src/gtk/toga_gtk/__init__.py | 2 +- src/iOS/toga_iOS/__init__.py | 2 +- src/web/toga_web/__init__.py | 2 +- src/winforms/toga_winforms/__init__.py | 2 +- 50 files changed, 56 insertions(+), 56 deletions(-) diff --git a/demo/pyproject.toml b/demo/pyproject.toml index 31f18bd50a..93e7f7a1da 100644 --- a/demo/pyproject.toml +++ b/demo/pyproject.toml @@ -2,7 +2,7 @@ [tool.briefcase] project_name = "Toga Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = "Tiberius Yak" @@ -16,26 +16,26 @@ requires = [] [tool.briefcase.app.toga-demo.macOS] requires = [ - "toga-cocoa==0.3.0.dev39", + "toga-cocoa==0.0.1rc1", ] [tool.briefcase.app.toga-demo.linux] requires = [ - "toga-gtk==0.3.0.dev39", + "toga-gtk==0.0.1rc1", ] [tool.briefcase.app.toga-demo.windows] requires = [ - "toga-winforms==0.3.0.dev39", + "toga-winforms==0.0.1rc1", ] # Mobile deployments [tool.briefcase.app.toga-demo.iOS] requires = [ - "toga-iOS==0.3.0.dev39", + "toga-iOS==0.0.1rc1", ] [tool.briefcase.app.toga-demo.android] requires = [ - "toga-android==0.3.0.dev39", + "toga-android==0.0.1rc1", ] diff --git a/demo/setup.cfg b/demo/setup.cfg index f34d466b45..074b92ad07 100644 --- a/demo/setup.cfg +++ b/demo/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = toga-demo -version = 0.3.0.dev39 +version = 0.0.1rc1 description = A demonstration of the capabilities of the Toga widget toolkit. url = https://beeware.org/project/projects/libraries/toga/ project_urls = @@ -47,7 +47,7 @@ keywords = [options] install_requires = - toga==0.3.0.dev39 + toga==0.0.1rc1 packages = find: python_requires = >= 3.5 diff --git a/examples/.template/{{ cookiecutter.name }}/pyproject.toml b/examples/.template/{{ cookiecutter.name }}/pyproject.toml index ec6e516d19..d397262bfc 100644 --- a/examples/.template/{{ cookiecutter.name }}/pyproject.toml +++ b/examples/.template/{{ cookiecutter.name }}/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "{{ cookiecutter.formal_name }}" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/activityindicator/pyproject.toml b/examples/activityindicator/pyproject.toml index 9d2b5bc2b5..1595ab81b1 100644 --- a/examples/activityindicator/pyproject.toml +++ b/examples/activityindicator/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Activity Indicator" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/beeliza/pyproject.toml b/examples/beeliza/pyproject.toml index 4cd338c926..1ea503f54c 100644 --- a/examples/beeliza/pyproject.toml +++ b/examples/beeliza/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Beeliza" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/box/pyproject.toml b/examples/box/pyproject.toml index 542b05b9ee..7919a7bd70 100644 --- a/examples/box/pyproject.toml +++ b/examples/box/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Box Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/button/pyproject.toml b/examples/button/pyproject.toml index f31644e598..854b10708b 100644 --- a/examples/button/pyproject.toml +++ b/examples/button/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Button Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/canvas/pyproject.toml b/examples/canvas/pyproject.toml index 0715f0a08b..13d6280f43 100644 --- a/examples/canvas/pyproject.toml +++ b/examples/canvas/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Canvas Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/colors/pyproject.toml b/examples/colors/pyproject.toml index 1e1aa613c9..55bca188e0 100644 --- a/examples/colors/pyproject.toml +++ b/examples/colors/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "colors" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/command/pyproject.toml b/examples/command/pyproject.toml index 905ddf2ce5..baa65ec91d 100644 --- a/examples/command/pyproject.toml +++ b/examples/command/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Command Example" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/date_and_time/pyproject.toml b/examples/date_and_time/pyproject.toml index 92a56ee6a8..b3c47c46f2 100644 --- a/examples/date_and_time/pyproject.toml +++ b/examples/date_and_time/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Date And Time" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/detailedlist/pyproject.toml b/examples/detailedlist/pyproject.toml index 29a36a6c63..32522bf2bd 100644 --- a/examples/detailedlist/pyproject.toml +++ b/examples/detailedlist/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "DetailedList Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/dialogs/pyproject.toml b/examples/dialogs/pyproject.toml index bc2f183665..d00ffd1998 100644 --- a/examples/dialogs/pyproject.toml +++ b/examples/dialogs/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Dialog Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/divider/pyproject.toml b/examples/divider/pyproject.toml index 17cbcb20a1..765eec5587 100644 --- a/examples/divider/pyproject.toml +++ b/examples/divider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Divider Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/examples_overview/pyproject.toml b/examples/examples_overview/pyproject.toml index 0b7e060cc6..1bf4fffd27 100644 --- a/examples/examples_overview/pyproject.toml +++ b/examples/examples_overview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Examples Overview" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/focus/pyproject.toml b/examples/focus/pyproject.toml index 44a4d828d7..bfb9539f39 100644 --- a/examples/focus/pyproject.toml +++ b/examples/focus/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Focus Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/font/pyproject.toml b/examples/font/pyproject.toml index cdb0e84ea7..581bed42a6 100644 --- a/examples/font/pyproject.toml +++ b/examples/font/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Font Example" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/handlers/pyproject.toml b/examples/handlers/pyproject.toml index 12b0ee41e5..fd91f87da0 100644 --- a/examples/handlers/pyproject.toml +++ b/examples/handlers/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Handler Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/imageview/pyproject.toml b/examples/imageview/pyproject.toml index dd75f1bec3..555951e632 100644 --- a/examples/imageview/pyproject.toml +++ b/examples/imageview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ImageView Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/layout/pyproject.toml b/examples/layout/pyproject.toml index a05c152c37..2cfbc74ed4 100644 --- a/examples/layout/pyproject.toml +++ b/examples/layout/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Layout Test" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/multilinetextinput/pyproject.toml b/examples/multilinetextinput/pyproject.toml index 34e6efaa49..24ef87c57b 100644 --- a/examples/multilinetextinput/pyproject.toml +++ b/examples/multilinetextinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "MultilineTextInput Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/numberinput/pyproject.toml b/examples/numberinput/pyproject.toml index 739c4159d9..f072d736e7 100644 --- a/examples/numberinput/pyproject.toml +++ b/examples/numberinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Demo NumberInput" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/optioncontainer/pyproject.toml b/examples/optioncontainer/pyproject.toml index b5d1f809c5..c7adf4a73d 100644 --- a/examples/optioncontainer/pyproject.toml +++ b/examples/optioncontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Option Container Example" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-django/pyproject.toml b/examples/positron-django/pyproject.toml index fb6318bdcb..0707f81b73 100644 --- a/examples/positron-django/pyproject.toml +++ b/examples/positron-django/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-static/pyproject.toml b/examples/positron-static/pyproject.toml index 5ee0388fd5..6addba5ed0 100644 --- a/examples/positron-static/pyproject.toml +++ b/examples/positron-static/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/progressbar/pyproject.toml b/examples/progressbar/pyproject.toml index 3b321c1dd8..97cce821f4 100644 --- a/examples/progressbar/pyproject.toml +++ b/examples/progressbar/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ProgressBar demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/scrollcontainer/pyproject.toml b/examples/scrollcontainer/pyproject.toml index 0ab52b3373..55f893f388 100644 --- a/examples/scrollcontainer/pyproject.toml +++ b/examples/scrollcontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ScrollContainer Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/selection/pyproject.toml b/examples/selection/pyproject.toml index 2b9417afe5..ea1253af5c 100644 --- a/examples/selection/pyproject.toml +++ b/examples/selection/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Selection Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/slider/pyproject.toml b/examples/slider/pyproject.toml index 73bd6c1185..a478bcd998 100644 --- a/examples/slider/pyproject.toml +++ b/examples/slider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Slider Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/switch_demo/pyproject.toml b/examples/switch_demo/pyproject.toml index 4865c6839a..9f09f61914 100644 --- a/examples/switch_demo/pyproject.toml +++ b/examples/switch_demo/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Switch Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table/pyproject.toml b/examples/table/pyproject.toml index 9a36c732b5..97ca3a42ea 100644 --- a/examples/table/pyproject.toml +++ b/examples/table/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Table Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table_source/pyproject.toml b/examples/table_source/pyproject.toml index ad385e396b..ac0c63cbf9 100644 --- a/examples/table_source/pyproject.toml +++ b/examples/table_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TableSource Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/textinput/pyproject.toml b/examples/textinput/pyproject.toml index f2ba08464f..a771ee620a 100644 --- a/examples/textinput/pyproject.toml +++ b/examples/textinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Text Input Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree/pyproject.toml b/examples/tree/pyproject.toml index e362bb5d2b..87421372c9 100644 --- a/examples/tree/pyproject.toml +++ b/examples/tree/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tree Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree_source/pyproject.toml b/examples/tree_source/pyproject.toml index c5ac305819..cf1d252c29 100644 --- a/examples/tree_source/pyproject.toml +++ b/examples/tree_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TreeSource Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial0/pyproject.toml b/examples/tutorial0/pyproject.toml index c9fa066741..4e9fd310b5 100644 --- a/examples/tutorial0/pyproject.toml +++ b/examples/tutorial0/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 0" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial1/pyproject.toml b/examples/tutorial1/pyproject.toml index d7d99a6186..f1b54b172d 100644 --- a/examples/tutorial1/pyproject.toml +++ b/examples/tutorial1/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 1" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial2/pyproject.toml b/examples/tutorial2/pyproject.toml index e160de7821..dc8c3b3885 100644 --- a/examples/tutorial2/pyproject.toml +++ b/examples/tutorial2/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 2" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial3/pyproject.toml b/examples/tutorial3/pyproject.toml index 57a34f933d..2dba54dc48 100644 --- a/examples/tutorial3/pyproject.toml +++ b/examples/tutorial3/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 3" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial4/pyproject.toml b/examples/tutorial4/pyproject.toml index 308f8d7f87..e8a327bd14 100644 --- a/examples/tutorial4/pyproject.toml +++ b/examples/tutorial4/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 4" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/webview/pyproject.toml b/examples/webview/pyproject.toml index b00e4221c5..c225fb2416 100644 --- a/examples/webview/pyproject.toml +++ b/examples/webview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "WebView Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/window/pyproject.toml b/examples/window/pyproject.toml index 4c25312d3b..a899f13dee 100644 --- a/examples/window/pyproject.toml +++ b/examples/window/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Window Demo" bundle = "org.beeware" -version = "0.3.0.dev39" +version = "0.0.1rc1" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/src/android/toga_android/__init__.py b/src/android/toga_android/__init__.py index d400fada11..e79434d5d0 100644 --- a/src/android/toga_android/__init__.py +++ b/src/android/toga_android/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' diff --git a/src/cocoa/toga_cocoa/__init__.py b/src/cocoa/toga_cocoa/__init__.py index d400fada11..e79434d5d0 100644 --- a/src/cocoa/toga_cocoa/__init__.py +++ b/src/cocoa/toga_cocoa/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' diff --git a/src/core/toga/__init__.py b/src/core/toga/__init__.py index d3638278cc..ffad00eead 100644 --- a/src/core/toga/__init__.py +++ b/src/core/toga/__init__.py @@ -88,4 +88,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' diff --git a/src/dummy/toga_dummy/__init__.py b/src/dummy/toga_dummy/__init__.py index ba7582d45c..2de8875f84 100644 --- a/src/dummy/toga_dummy/__init__.py +++ b/src/dummy/toga_dummy/__init__.py @@ -8,4 +8,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' diff --git a/src/gtk/toga_gtk/__init__.py b/src/gtk/toga_gtk/__init__.py index d400fada11..e79434d5d0 100644 --- a/src/gtk/toga_gtk/__init__.py +++ b/src/gtk/toga_gtk/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' diff --git a/src/iOS/toga_iOS/__init__.py b/src/iOS/toga_iOS/__init__.py index d400fada11..e79434d5d0 100644 --- a/src/iOS/toga_iOS/__init__.py +++ b/src/iOS/toga_iOS/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' diff --git a/src/web/toga_web/__init__.py b/src/web/toga_web/__init__.py index d400fada11..e79434d5d0 100644 --- a/src/web/toga_web/__init__.py +++ b/src/web/toga_web/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' diff --git a/src/winforms/toga_winforms/__init__.py b/src/winforms/toga_winforms/__init__.py index d400fada11..e79434d5d0 100644 --- a/src/winforms/toga_winforms/__init__.py +++ b/src/winforms/toga_winforms/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.3.0.dev39' +__version__ = '0.0.1rc1' From bc0abf4776253fc5078bd575a6e2a58a21128d4d Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Fri, 14 Oct 2022 19:06:14 +0100 Subject: [PATCH 08/19] Collect packages in one directory before running gh-action-pypi-publish / Temporarily disable all tests --- .github/workflows/ci.yml | 92 +++++++++++++++++------------------ .github/workflows/release.yml | 4 +- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bb3a58922..47bf0f9cbf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,49 +78,49 @@ jobs: # flags: unittests # fail_ci_if_error: true - backend: - needs: beefore # FIXME core - strategy: - matrix: - backend: [android, cocoa, gtk, iOS, web, winforms] - include: - - runs-on: ubuntu-latest - - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) - - pre-command: - - test-command: pytest - - backend: cocoa - runs-on: macos-latest - - backend: gtk - pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" - test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" - - 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" - runs-on: ${{ matrix.runs-on }} - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3.1.2 - with: - # Py3.9 is the first Python version for which - # a wheel of pythonnet isn't available on PyPI. - python-version: ${{ matrix.python-version }} - - name: Get packages - uses: actions/download-artifact@v3 - with: - name: packages - - name: Install dependencies - run: | - ${{ matrix.pre-command }} - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install pytest-tldr - python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl - - name: Test - run: | - cd src/${{ matrix.backend }} - ${{ matrix.test-command }} + # backend: + # needs: beefore + # strategy: + # matrix: + # backend: [android, cocoa, gtk, iOS, web, winforms] + # include: + # - runs-on: ubuntu-latest + # - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) + # - pre-command: + # - test-command: pytest + # - backend: cocoa + # runs-on: macos-latest + # - backend: gtk + # pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" + # test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" + # - 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" + # runs-on: ${{ matrix.runs-on }} + # steps: + # - uses: actions/checkout@v1 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v3.1.2 + # with: + # # Py3.9 is the first Python version for which + # # a wheel of pythonnet isn't available on PyPI. + # python-version: ${{ matrix.python-version }} + # - name: Get packages + # uses: actions/download-artifact@v3 + # with: + # name: packages + # - name: Install dependencies + # run: | + # ${{ matrix.pre-command }} + # python -m pip install --upgrade pip + # python -m pip install --upgrade setuptools + # python -m pip install pytest-tldr + # python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl + # - name: Test + # run: | + # cd src/${{ matrix.backend }} + # ${{ matrix.test-command }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1704571e7d..5ed35abb0a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,12 +22,14 @@ jobs: uses: actions/download-artifact@v3 with: name: packages + - name: Collect packages + run: mv {demo,src/*}/dist/* dist - name: Create Release uses: ncipollo/release-action@v1.11.1 with: name: ${{ env.VERSION }} draft: true - artifacts: "**/dist/*" + artifacts: "dist/*" artifactErrorsFailBuild: true - name: Publish release to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 From a3ed108579ffa30832252c81a9033173b3ae27c4 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 14:07:26 +0100 Subject: [PATCH 09/19] Make core and dummy use src subdirectories / Enable core tests --- .github/workflows/ci.yml | 72 +++++++++--------- release.sh | 36 +-------- src/core/MANIFEST.in | 4 - src/core/setup.cfg | 8 +- src/core/setup.py | 2 +- src/core/{ => src}/toga/__init__.py | 0 src/core/{ => src}/toga/app.py | 0 src/core/{ => src}/toga/colors.py | 0 src/core/{ => src}/toga/command.py | 0 src/core/{ => src}/toga/constants/__init__.py | 0 src/core/{ => src}/toga/documents.py | 0 src/core/{ => src}/toga/fonts.py | 0 src/core/{ => src}/toga/handlers.py | 0 src/core/{ => src}/toga/hardware/__init__.py | 0 src/core/{ => src}/toga/icons.py | 0 src/core/{ => src}/toga/images.py | 0 src/core/{ => src}/toga/keys.py | 0 src/core/{ => src}/toga/platform.py | 0 src/core/{ => src}/toga/resources/__init__.py | 0 src/core/{ => src}/toga/resources/toga-32.png | Bin src/core/{ => src}/toga/resources/toga.icns | Bin src/core/{ => src}/toga/resources/toga.ico | Bin src/core/{ => src}/toga/sources/__init__.py | 0 src/core/{ => src}/toga/sources/accessors.py | 0 src/core/{ => src}/toga/sources/base.py | 0 .../{ => src}/toga/sources/list_source.py | 0 .../{ => src}/toga/sources/tree_source.py | 0 .../{ => src}/toga/sources/value_source.py | 0 src/core/{ => src}/toga/style/__init__.py | 0 src/core/{ => src}/toga/style/applicator.py | 0 src/core/{ => src}/toga/style/pack.py | 0 src/core/{ => src}/toga/validators.py | 0 src/core/{ => src}/toga/widgets/__init__.py | 0 .../toga/widgets/activityindicator.py | 0 src/core/{ => src}/toga/widgets/base.py | 0 src/core/{ => src}/toga/widgets/box.py | 0 src/core/{ => src}/toga/widgets/button.py | 0 src/core/{ => src}/toga/widgets/canvas.py | 0 src/core/{ => src}/toga/widgets/datepicker.py | 0 .../{ => src}/toga/widgets/detailedlist.py | 0 src/core/{ => src}/toga/widgets/divider.py | 0 src/core/{ => src}/toga/widgets/imageview.py | 0 src/core/{ => src}/toga/widgets/label.py | 0 .../toga/widgets/multilinetextinput.py | 0 .../{ => src}/toga/widgets/navigationview.py | 0 .../{ => src}/toga/widgets/numberinput.py | 0 .../{ => src}/toga/widgets/optioncontainer.py | 0 .../{ => src}/toga/widgets/passwordinput.py | 0 .../{ => src}/toga/widgets/progressbar.py | 0 .../{ => src}/toga/widgets/scrollcontainer.py | 0 src/core/{ => src}/toga/widgets/selection.py | 0 src/core/{ => src}/toga/widgets/slider.py | 0 .../{ => src}/toga/widgets/splitcontainer.py | 0 src/core/{ => src}/toga/widgets/switch.py | 0 src/core/{ => src}/toga/widgets/table.py | 0 src/core/{ => src}/toga/widgets/textinput.py | 0 src/core/{ => src}/toga/widgets/timepicker.py | 0 src/core/{ => src}/toga/widgets/tree.py | 0 src/core/{ => src}/toga/widgets/webview.py | 0 src/core/{ => src}/toga/window.py | 0 src/dummy/MANIFEST.in | 1 - src/dummy/setup.cfg | 8 +- src/dummy/setup.py | 2 +- src/dummy/{ => src}/toga_dummy/__init__.py | 0 src/dummy/{ => src}/toga_dummy/app.py | 0 src/dummy/{ => src}/toga_dummy/colors.py | 0 src/dummy/{ => src}/toga_dummy/command.py | 0 src/dummy/{ => src}/toga_dummy/container.py | 0 src/dummy/{ => src}/toga_dummy/dialogs.py | 0 src/dummy/{ => src}/toga_dummy/documents.py | 0 src/dummy/{ => src}/toga_dummy/factory.py | 0 src/dummy/{ => src}/toga_dummy/fonts.py | 0 src/dummy/{ => src}/toga_dummy/icons.py | 0 src/dummy/{ => src}/toga_dummy/images.py | 0 src/dummy/{ => src}/toga_dummy/paths.py | 0 .../toga_dummy/test_implementation.py | 0 src/dummy/{ => src}/toga_dummy/utils.py | 0 .../{ => src}/toga_dummy/widgets/__init__.py | 0 .../toga_dummy/widgets/activityindicator.py | 0 .../{ => src}/toga_dummy/widgets/base.py | 0 src/dummy/{ => src}/toga_dummy/widgets/box.py | 0 .../{ => src}/toga_dummy/widgets/button.py | 0 .../{ => src}/toga_dummy/widgets/canvas.py | 0 .../toga_dummy/widgets/datepicker.py | 0 .../toga_dummy/widgets/detailedlist.py | 0 .../{ => src}/toga_dummy/widgets/divider.py | 0 .../{ => src}/toga_dummy/widgets/imageview.py | 0 .../{ => src}/toga_dummy/widgets/label.py | 0 .../toga_dummy/widgets/multilinetextinput.py | 0 .../toga_dummy/widgets/navigationview.py | 0 .../toga_dummy/widgets/numberinput.py | 0 .../toga_dummy/widgets/optioncontainer.py | 0 .../toga_dummy/widgets/passwordinput.py | 0 .../toga_dummy/widgets/progressbar.py | 0 .../toga_dummy/widgets/scrollcontainer.py | 0 .../{ => src}/toga_dummy/widgets/selection.py | 0 .../{ => src}/toga_dummy/widgets/slider.py | 0 .../toga_dummy/widgets/splitcontainer.py | 0 .../{ => src}/toga_dummy/widgets/switch.py | 0 .../{ => src}/toga_dummy/widgets/table.py | 0 .../{ => src}/toga_dummy/widgets/textinput.py | 0 .../toga_dummy/widgets/timepicker.py | 0 .../{ => src}/toga_dummy/widgets/tree.py | 0 .../{ => src}/toga_dummy/widgets/webview.py | 0 src/dummy/{ => src}/toga_dummy/window.py | 0 tox.ini | 4 +- 106 files changed, 47 insertions(+), 90 deletions(-) rename src/core/{ => src}/toga/__init__.py (100%) rename src/core/{ => src}/toga/app.py (100%) rename src/core/{ => src}/toga/colors.py (100%) rename src/core/{ => src}/toga/command.py (100%) rename src/core/{ => src}/toga/constants/__init__.py (100%) rename src/core/{ => src}/toga/documents.py (100%) rename src/core/{ => src}/toga/fonts.py (100%) rename src/core/{ => src}/toga/handlers.py (100%) rename src/core/{ => src}/toga/hardware/__init__.py (100%) rename src/core/{ => src}/toga/icons.py (100%) rename src/core/{ => src}/toga/images.py (100%) rename src/core/{ => src}/toga/keys.py (100%) rename src/core/{ => src}/toga/platform.py (100%) rename src/core/{ => src}/toga/resources/__init__.py (100%) rename src/core/{ => src}/toga/resources/toga-32.png (100%) rename src/core/{ => src}/toga/resources/toga.icns (100%) rename src/core/{ => src}/toga/resources/toga.ico (100%) rename src/core/{ => src}/toga/sources/__init__.py (100%) rename src/core/{ => src}/toga/sources/accessors.py (100%) rename src/core/{ => src}/toga/sources/base.py (100%) rename src/core/{ => src}/toga/sources/list_source.py (100%) rename src/core/{ => src}/toga/sources/tree_source.py (100%) rename src/core/{ => src}/toga/sources/value_source.py (100%) rename src/core/{ => src}/toga/style/__init__.py (100%) rename src/core/{ => src}/toga/style/applicator.py (100%) rename src/core/{ => src}/toga/style/pack.py (100%) rename src/core/{ => src}/toga/validators.py (100%) rename src/core/{ => src}/toga/widgets/__init__.py (100%) rename src/core/{ => src}/toga/widgets/activityindicator.py (100%) rename src/core/{ => src}/toga/widgets/base.py (100%) rename src/core/{ => src}/toga/widgets/box.py (100%) rename src/core/{ => src}/toga/widgets/button.py (100%) rename src/core/{ => src}/toga/widgets/canvas.py (100%) rename src/core/{ => src}/toga/widgets/datepicker.py (100%) rename src/core/{ => src}/toga/widgets/detailedlist.py (100%) rename src/core/{ => src}/toga/widgets/divider.py (100%) rename src/core/{ => src}/toga/widgets/imageview.py (100%) rename src/core/{ => src}/toga/widgets/label.py (100%) rename src/core/{ => src}/toga/widgets/multilinetextinput.py (100%) rename src/core/{ => src}/toga/widgets/navigationview.py (100%) rename src/core/{ => src}/toga/widgets/numberinput.py (100%) rename src/core/{ => src}/toga/widgets/optioncontainer.py (100%) rename src/core/{ => src}/toga/widgets/passwordinput.py (100%) rename src/core/{ => src}/toga/widgets/progressbar.py (100%) rename src/core/{ => src}/toga/widgets/scrollcontainer.py (100%) rename src/core/{ => src}/toga/widgets/selection.py (100%) rename src/core/{ => src}/toga/widgets/slider.py (100%) rename src/core/{ => src}/toga/widgets/splitcontainer.py (100%) rename src/core/{ => src}/toga/widgets/switch.py (100%) rename src/core/{ => src}/toga/widgets/table.py (100%) rename src/core/{ => src}/toga/widgets/textinput.py (100%) rename src/core/{ => src}/toga/widgets/timepicker.py (100%) rename src/core/{ => src}/toga/widgets/tree.py (100%) rename src/core/{ => src}/toga/widgets/webview.py (100%) rename src/core/{ => src}/toga/window.py (100%) rename src/dummy/{ => src}/toga_dummy/__init__.py (100%) rename src/dummy/{ => src}/toga_dummy/app.py (100%) rename src/dummy/{ => src}/toga_dummy/colors.py (100%) rename src/dummy/{ => src}/toga_dummy/command.py (100%) rename src/dummy/{ => src}/toga_dummy/container.py (100%) rename src/dummy/{ => src}/toga_dummy/dialogs.py (100%) rename src/dummy/{ => src}/toga_dummy/documents.py (100%) rename src/dummy/{ => src}/toga_dummy/factory.py (100%) rename src/dummy/{ => src}/toga_dummy/fonts.py (100%) rename src/dummy/{ => src}/toga_dummy/icons.py (100%) rename src/dummy/{ => src}/toga_dummy/images.py (100%) rename src/dummy/{ => src}/toga_dummy/paths.py (100%) rename src/dummy/{ => src}/toga_dummy/test_implementation.py (100%) rename src/dummy/{ => src}/toga_dummy/utils.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/__init__.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/activityindicator.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/base.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/box.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/button.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/canvas.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/datepicker.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/detailedlist.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/divider.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/imageview.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/label.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/multilinetextinput.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/navigationview.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/numberinput.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/optioncontainer.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/passwordinput.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/progressbar.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/scrollcontainer.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/selection.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/slider.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/splitcontainer.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/switch.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/table.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/textinput.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/timepicker.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/tree.py (100%) rename src/dummy/{ => src}/toga_dummy/widgets/webview.py (100%) rename src/dummy/{ => src}/toga_dummy/window.py (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47bf0f9cbf..2407ca7e2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ env: defaults: run: - shell: bash # PowerShell doesn't stop after failed commands. + shell: bash jobs: beefore: @@ -42,42 +42,42 @@ jobs: path: "**/dist" if-no-files-found: error - # FIXME - # core: - # needs: beefore - # strategy: - # matrix: - # platform: ['macos', 'ubuntu', 'windows'] - # python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] - # runs-on: ${{ matrix.platform }}-latest - # steps: - # - uses: actions/checkout@v1 - # - name: Set up Python ${{ matrix.python-version }} - # uses: actions/setup-python@v3.1.2 - # with: - # python-version: ${{ matrix.python-version }} - # - name: Install dependencies - # run: | - # python -m pip install --upgrade pip - # python -m pip install --upgrade setuptools - # python -m pip install --upgrade tox - # - name: Get packages - # uses: actions/download-artifact@v3 - # with: - # name: packages - # - name: Test - # env: - # TOGA_INSTALL_COMMAND: 'bash -c "pip install src/{core,dummy}/dist/*.whl"' - # run: | - # tox -e py - # - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version - # uses: codecov/codecov-action@v1 - # with: - # token: ${{ secrets.CODECOV_TOKEN }} - # file: ./coverage.xml - # flags: unittests - # fail_ci_if_error: true + core: + needs: beefore + strategy: + matrix: + platform: ['macos', 'ubuntu', 'windows'] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] + runs-on: ${{ matrix.platform }}-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3.1.2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools + python -m pip install --upgrade tox + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages + - name: Test + env: + TOGA_INSTALL_COMMAND: 'bash -c "pip install src/{core,dummy}/dist/*.whl"' + run: | + tox -e py + - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: ./coverage.xml + flags: unittests + fail_ci_if_error: true + # FIXME # backend: # needs: beefore # strategy: diff --git a/release.sh b/release.sh index f3d70a1315..0ea0a3a2a8 100755 --- a/release.sh +++ b/release.sh @@ -34,9 +34,9 @@ function bump { else if [ "$1" = "core" ]; then - pushd src/$1/toga + pushd src/$1/src/toga else - pushd src/$1/toga_$1 + pushd src/$1/src/toga_$1 fi mv __init__.py temp @@ -90,31 +90,13 @@ function install { fi } -function release { - echo - echo "************************************************************" - echo "RELEASE $1 version $2" - echo "************************************************************" - echo - if [ "$1" = "toga" ]; then - twine upload "dist/toga-$2-py3-none-any.whl" - twine upload "dist/toga-$2.tar.gz" - elif [ "$1" = "demo" ]; then - twine upload "demo/dist/toga_demo-$2-py3-none-any.whl" - twine upload "demo/dist/toga-demo-$2.tar.gz" - else - twine upload "src/$1/dist/toga_$1-$2-py3-none-any.whl" - twine upload "src/$1/dist/toga-$1-$2.tar.gz" - fi -} - -MODULES="android cocoa core dummy gtk iOS web winforms toga demo" +MODULES="core dummy" # FIXME android cocoa core dummy gtk iOS web winforms toga demo action=$1 shift -VERSION=$(grep "^__version__ = '.*'$" src/core/toga/__init__.py | cut -f 2 -d \') +VERSION=$(grep "^__version__ = '.*'$" src/core/src/toga/__init__.py | cut -f 2 -d \') if [ "$action" = "" ]; then echo "Usage -" @@ -146,16 +128,6 @@ elif [ "$action" = "test" ]; then install $module done -elif [ "$action" = "release" ]; then - - for module in $MODULES; do - $action $module $VERSION - done - - git tag v$VERSION - git push upstream release:main - git push --tags upstream release:main - elif [ "$action" = "bump" ]; then version=$1 shift diff --git a/src/core/MANIFEST.in b/src/core/MANIFEST.in index 661394bb83..07777e3f2c 100644 --- a/src/core/MANIFEST.in +++ b/src/core/MANIFEST.in @@ -1,10 +1,6 @@ include CONTRIBUTING.md include LICENSE include README.rst -recursive-include toga *.py -recursive-include toga/resources *.png -recursive-include toga/resources *.icns -recursive-include toga/resources *.ico recursive-include tests *.py include tests/testbed/installed.dist-info/INSTALLER include tests/testbed/installed.dist-info/METADATA diff --git a/src/core/setup.cfg b/src/core/setup.cfg index 4fb95088b7..e994902f88 100644 --- a/src/core/setup.cfg +++ b/src/core/setup.cfg @@ -50,7 +50,8 @@ keywords = install_requires = travertino>=0.1.3 importlib_metadata; python_version<"3.8" -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False @@ -60,11 +61,6 @@ toga.resources = *.ico *.png -[options.packages.find] -include = - toga - toga.* - [flake8] exclude=\ .eggs/*,\ diff --git a/src/core/setup.py b/src/core/setup.py index 3ac14b412a..2e109950d0 100644 --- a/src/core/setup.py +++ b/src/core/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga to compute the version; # and to support versioned subpackage dependencies -with open('toga/__init__.py', encoding='utf8') as version_file: +with open('src/toga/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/core/toga/__init__.py b/src/core/src/toga/__init__.py similarity index 100% rename from src/core/toga/__init__.py rename to src/core/src/toga/__init__.py diff --git a/src/core/toga/app.py b/src/core/src/toga/app.py similarity index 100% rename from src/core/toga/app.py rename to src/core/src/toga/app.py diff --git a/src/core/toga/colors.py b/src/core/src/toga/colors.py similarity index 100% rename from src/core/toga/colors.py rename to src/core/src/toga/colors.py diff --git a/src/core/toga/command.py b/src/core/src/toga/command.py similarity index 100% rename from src/core/toga/command.py rename to src/core/src/toga/command.py diff --git a/src/core/toga/constants/__init__.py b/src/core/src/toga/constants/__init__.py similarity index 100% rename from src/core/toga/constants/__init__.py rename to src/core/src/toga/constants/__init__.py diff --git a/src/core/toga/documents.py b/src/core/src/toga/documents.py similarity index 100% rename from src/core/toga/documents.py rename to src/core/src/toga/documents.py diff --git a/src/core/toga/fonts.py b/src/core/src/toga/fonts.py similarity index 100% rename from src/core/toga/fonts.py rename to src/core/src/toga/fonts.py diff --git a/src/core/toga/handlers.py b/src/core/src/toga/handlers.py similarity index 100% rename from src/core/toga/handlers.py rename to src/core/src/toga/handlers.py diff --git a/src/core/toga/hardware/__init__.py b/src/core/src/toga/hardware/__init__.py similarity index 100% rename from src/core/toga/hardware/__init__.py rename to src/core/src/toga/hardware/__init__.py diff --git a/src/core/toga/icons.py b/src/core/src/toga/icons.py similarity index 100% rename from src/core/toga/icons.py rename to src/core/src/toga/icons.py diff --git a/src/core/toga/images.py b/src/core/src/toga/images.py similarity index 100% rename from src/core/toga/images.py rename to src/core/src/toga/images.py diff --git a/src/core/toga/keys.py b/src/core/src/toga/keys.py similarity index 100% rename from src/core/toga/keys.py rename to src/core/src/toga/keys.py diff --git a/src/core/toga/platform.py b/src/core/src/toga/platform.py similarity index 100% rename from src/core/toga/platform.py rename to src/core/src/toga/platform.py diff --git a/src/core/toga/resources/__init__.py b/src/core/src/toga/resources/__init__.py similarity index 100% rename from src/core/toga/resources/__init__.py rename to src/core/src/toga/resources/__init__.py diff --git a/src/core/toga/resources/toga-32.png b/src/core/src/toga/resources/toga-32.png similarity index 100% rename from src/core/toga/resources/toga-32.png rename to src/core/src/toga/resources/toga-32.png diff --git a/src/core/toga/resources/toga.icns b/src/core/src/toga/resources/toga.icns similarity index 100% rename from src/core/toga/resources/toga.icns rename to src/core/src/toga/resources/toga.icns diff --git a/src/core/toga/resources/toga.ico b/src/core/src/toga/resources/toga.ico similarity index 100% rename from src/core/toga/resources/toga.ico rename to src/core/src/toga/resources/toga.ico diff --git a/src/core/toga/sources/__init__.py b/src/core/src/toga/sources/__init__.py similarity index 100% rename from src/core/toga/sources/__init__.py rename to src/core/src/toga/sources/__init__.py diff --git a/src/core/toga/sources/accessors.py b/src/core/src/toga/sources/accessors.py similarity index 100% rename from src/core/toga/sources/accessors.py rename to src/core/src/toga/sources/accessors.py diff --git a/src/core/toga/sources/base.py b/src/core/src/toga/sources/base.py similarity index 100% rename from src/core/toga/sources/base.py rename to src/core/src/toga/sources/base.py diff --git a/src/core/toga/sources/list_source.py b/src/core/src/toga/sources/list_source.py similarity index 100% rename from src/core/toga/sources/list_source.py rename to src/core/src/toga/sources/list_source.py diff --git a/src/core/toga/sources/tree_source.py b/src/core/src/toga/sources/tree_source.py similarity index 100% rename from src/core/toga/sources/tree_source.py rename to src/core/src/toga/sources/tree_source.py diff --git a/src/core/toga/sources/value_source.py b/src/core/src/toga/sources/value_source.py similarity index 100% rename from src/core/toga/sources/value_source.py rename to src/core/src/toga/sources/value_source.py diff --git a/src/core/toga/style/__init__.py b/src/core/src/toga/style/__init__.py similarity index 100% rename from src/core/toga/style/__init__.py rename to src/core/src/toga/style/__init__.py diff --git a/src/core/toga/style/applicator.py b/src/core/src/toga/style/applicator.py similarity index 100% rename from src/core/toga/style/applicator.py rename to src/core/src/toga/style/applicator.py diff --git a/src/core/toga/style/pack.py b/src/core/src/toga/style/pack.py similarity index 100% rename from src/core/toga/style/pack.py rename to src/core/src/toga/style/pack.py diff --git a/src/core/toga/validators.py b/src/core/src/toga/validators.py similarity index 100% rename from src/core/toga/validators.py rename to src/core/src/toga/validators.py diff --git a/src/core/toga/widgets/__init__.py b/src/core/src/toga/widgets/__init__.py similarity index 100% rename from src/core/toga/widgets/__init__.py rename to src/core/src/toga/widgets/__init__.py diff --git a/src/core/toga/widgets/activityindicator.py b/src/core/src/toga/widgets/activityindicator.py similarity index 100% rename from src/core/toga/widgets/activityindicator.py rename to src/core/src/toga/widgets/activityindicator.py diff --git a/src/core/toga/widgets/base.py b/src/core/src/toga/widgets/base.py similarity index 100% rename from src/core/toga/widgets/base.py rename to src/core/src/toga/widgets/base.py diff --git a/src/core/toga/widgets/box.py b/src/core/src/toga/widgets/box.py similarity index 100% rename from src/core/toga/widgets/box.py rename to src/core/src/toga/widgets/box.py diff --git a/src/core/toga/widgets/button.py b/src/core/src/toga/widgets/button.py similarity index 100% rename from src/core/toga/widgets/button.py rename to src/core/src/toga/widgets/button.py diff --git a/src/core/toga/widgets/canvas.py b/src/core/src/toga/widgets/canvas.py similarity index 100% rename from src/core/toga/widgets/canvas.py rename to src/core/src/toga/widgets/canvas.py diff --git a/src/core/toga/widgets/datepicker.py b/src/core/src/toga/widgets/datepicker.py similarity index 100% rename from src/core/toga/widgets/datepicker.py rename to src/core/src/toga/widgets/datepicker.py diff --git a/src/core/toga/widgets/detailedlist.py b/src/core/src/toga/widgets/detailedlist.py similarity index 100% rename from src/core/toga/widgets/detailedlist.py rename to src/core/src/toga/widgets/detailedlist.py diff --git a/src/core/toga/widgets/divider.py b/src/core/src/toga/widgets/divider.py similarity index 100% rename from src/core/toga/widgets/divider.py rename to src/core/src/toga/widgets/divider.py diff --git a/src/core/toga/widgets/imageview.py b/src/core/src/toga/widgets/imageview.py similarity index 100% rename from src/core/toga/widgets/imageview.py rename to src/core/src/toga/widgets/imageview.py diff --git a/src/core/toga/widgets/label.py b/src/core/src/toga/widgets/label.py similarity index 100% rename from src/core/toga/widgets/label.py rename to src/core/src/toga/widgets/label.py diff --git a/src/core/toga/widgets/multilinetextinput.py b/src/core/src/toga/widgets/multilinetextinput.py similarity index 100% rename from src/core/toga/widgets/multilinetextinput.py rename to src/core/src/toga/widgets/multilinetextinput.py diff --git a/src/core/toga/widgets/navigationview.py b/src/core/src/toga/widgets/navigationview.py similarity index 100% rename from src/core/toga/widgets/navigationview.py rename to src/core/src/toga/widgets/navigationview.py diff --git a/src/core/toga/widgets/numberinput.py b/src/core/src/toga/widgets/numberinput.py similarity index 100% rename from src/core/toga/widgets/numberinput.py rename to src/core/src/toga/widgets/numberinput.py diff --git a/src/core/toga/widgets/optioncontainer.py b/src/core/src/toga/widgets/optioncontainer.py similarity index 100% rename from src/core/toga/widgets/optioncontainer.py rename to src/core/src/toga/widgets/optioncontainer.py diff --git a/src/core/toga/widgets/passwordinput.py b/src/core/src/toga/widgets/passwordinput.py similarity index 100% rename from src/core/toga/widgets/passwordinput.py rename to src/core/src/toga/widgets/passwordinput.py diff --git a/src/core/toga/widgets/progressbar.py b/src/core/src/toga/widgets/progressbar.py similarity index 100% rename from src/core/toga/widgets/progressbar.py rename to src/core/src/toga/widgets/progressbar.py diff --git a/src/core/toga/widgets/scrollcontainer.py b/src/core/src/toga/widgets/scrollcontainer.py similarity index 100% rename from src/core/toga/widgets/scrollcontainer.py rename to src/core/src/toga/widgets/scrollcontainer.py diff --git a/src/core/toga/widgets/selection.py b/src/core/src/toga/widgets/selection.py similarity index 100% rename from src/core/toga/widgets/selection.py rename to src/core/src/toga/widgets/selection.py diff --git a/src/core/toga/widgets/slider.py b/src/core/src/toga/widgets/slider.py similarity index 100% rename from src/core/toga/widgets/slider.py rename to src/core/src/toga/widgets/slider.py diff --git a/src/core/toga/widgets/splitcontainer.py b/src/core/src/toga/widgets/splitcontainer.py similarity index 100% rename from src/core/toga/widgets/splitcontainer.py rename to src/core/src/toga/widgets/splitcontainer.py diff --git a/src/core/toga/widgets/switch.py b/src/core/src/toga/widgets/switch.py similarity index 100% rename from src/core/toga/widgets/switch.py rename to src/core/src/toga/widgets/switch.py diff --git a/src/core/toga/widgets/table.py b/src/core/src/toga/widgets/table.py similarity index 100% rename from src/core/toga/widgets/table.py rename to src/core/src/toga/widgets/table.py diff --git a/src/core/toga/widgets/textinput.py b/src/core/src/toga/widgets/textinput.py similarity index 100% rename from src/core/toga/widgets/textinput.py rename to src/core/src/toga/widgets/textinput.py diff --git a/src/core/toga/widgets/timepicker.py b/src/core/src/toga/widgets/timepicker.py similarity index 100% rename from src/core/toga/widgets/timepicker.py rename to src/core/src/toga/widgets/timepicker.py diff --git a/src/core/toga/widgets/tree.py b/src/core/src/toga/widgets/tree.py similarity index 100% rename from src/core/toga/widgets/tree.py rename to src/core/src/toga/widgets/tree.py diff --git a/src/core/toga/widgets/webview.py b/src/core/src/toga/widgets/webview.py similarity index 100% rename from src/core/toga/widgets/webview.py rename to src/core/src/toga/widgets/webview.py diff --git a/src/core/toga/window.py b/src/core/src/toga/window.py similarity index 100% rename from src/core/toga/window.py rename to src/core/src/toga/window.py diff --git a/src/dummy/MANIFEST.in b/src/dummy/MANIFEST.in index dbb91b2539..455ed92af4 100644 --- a/src/dummy/MANIFEST.in +++ b/src/dummy/MANIFEST.in @@ -1,4 +1,3 @@ include CONTRIBUTING.md include LICENSE include README.rst -recursive-include toga_dummy *.py diff --git a/src/dummy/setup.cfg b/src/dummy/setup.cfg index dd418c3ade..3ca5544adb 100644 --- a/src/dummy/setup.cfg +++ b/src/dummy/setup.cfg @@ -37,15 +37,11 @@ keywords = testing [options] -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False -[options.packages.find] -include = - toga_dummy - toga_dummy.* - [flake8] exclude=\ .eggs/*,\ diff --git a/src/dummy/setup.py b/src/dummy/setup.py index 807d321eeb..fcc354ca09 100644 --- a/src/dummy/setup.py +++ b/src/dummy/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga_dummy to compute the version; # and to support versioned subpackage dependencies -with open('toga_dummy/__init__.py', encoding='utf8') as version_file: +with open('src/toga_dummy/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/dummy/toga_dummy/__init__.py b/src/dummy/src/toga_dummy/__init__.py similarity index 100% rename from src/dummy/toga_dummy/__init__.py rename to src/dummy/src/toga_dummy/__init__.py diff --git a/src/dummy/toga_dummy/app.py b/src/dummy/src/toga_dummy/app.py similarity index 100% rename from src/dummy/toga_dummy/app.py rename to src/dummy/src/toga_dummy/app.py diff --git a/src/dummy/toga_dummy/colors.py b/src/dummy/src/toga_dummy/colors.py similarity index 100% rename from src/dummy/toga_dummy/colors.py rename to src/dummy/src/toga_dummy/colors.py diff --git a/src/dummy/toga_dummy/command.py b/src/dummy/src/toga_dummy/command.py similarity index 100% rename from src/dummy/toga_dummy/command.py rename to src/dummy/src/toga_dummy/command.py diff --git a/src/dummy/toga_dummy/container.py b/src/dummy/src/toga_dummy/container.py similarity index 100% rename from src/dummy/toga_dummy/container.py rename to src/dummy/src/toga_dummy/container.py diff --git a/src/dummy/toga_dummy/dialogs.py b/src/dummy/src/toga_dummy/dialogs.py similarity index 100% rename from src/dummy/toga_dummy/dialogs.py rename to src/dummy/src/toga_dummy/dialogs.py diff --git a/src/dummy/toga_dummy/documents.py b/src/dummy/src/toga_dummy/documents.py similarity index 100% rename from src/dummy/toga_dummy/documents.py rename to src/dummy/src/toga_dummy/documents.py diff --git a/src/dummy/toga_dummy/factory.py b/src/dummy/src/toga_dummy/factory.py similarity index 100% rename from src/dummy/toga_dummy/factory.py rename to src/dummy/src/toga_dummy/factory.py diff --git a/src/dummy/toga_dummy/fonts.py b/src/dummy/src/toga_dummy/fonts.py similarity index 100% rename from src/dummy/toga_dummy/fonts.py rename to src/dummy/src/toga_dummy/fonts.py diff --git a/src/dummy/toga_dummy/icons.py b/src/dummy/src/toga_dummy/icons.py similarity index 100% rename from src/dummy/toga_dummy/icons.py rename to src/dummy/src/toga_dummy/icons.py diff --git a/src/dummy/toga_dummy/images.py b/src/dummy/src/toga_dummy/images.py similarity index 100% rename from src/dummy/toga_dummy/images.py rename to src/dummy/src/toga_dummy/images.py diff --git a/src/dummy/toga_dummy/paths.py b/src/dummy/src/toga_dummy/paths.py similarity index 100% rename from src/dummy/toga_dummy/paths.py rename to src/dummy/src/toga_dummy/paths.py diff --git a/src/dummy/toga_dummy/test_implementation.py b/src/dummy/src/toga_dummy/test_implementation.py similarity index 100% rename from src/dummy/toga_dummy/test_implementation.py rename to src/dummy/src/toga_dummy/test_implementation.py diff --git a/src/dummy/toga_dummy/utils.py b/src/dummy/src/toga_dummy/utils.py similarity index 100% rename from src/dummy/toga_dummy/utils.py rename to src/dummy/src/toga_dummy/utils.py diff --git a/src/dummy/toga_dummy/widgets/__init__.py b/src/dummy/src/toga_dummy/widgets/__init__.py similarity index 100% rename from src/dummy/toga_dummy/widgets/__init__.py rename to src/dummy/src/toga_dummy/widgets/__init__.py diff --git a/src/dummy/toga_dummy/widgets/activityindicator.py b/src/dummy/src/toga_dummy/widgets/activityindicator.py similarity index 100% rename from src/dummy/toga_dummy/widgets/activityindicator.py rename to src/dummy/src/toga_dummy/widgets/activityindicator.py diff --git a/src/dummy/toga_dummy/widgets/base.py b/src/dummy/src/toga_dummy/widgets/base.py similarity index 100% rename from src/dummy/toga_dummy/widgets/base.py rename to src/dummy/src/toga_dummy/widgets/base.py diff --git a/src/dummy/toga_dummy/widgets/box.py b/src/dummy/src/toga_dummy/widgets/box.py similarity index 100% rename from src/dummy/toga_dummy/widgets/box.py rename to src/dummy/src/toga_dummy/widgets/box.py diff --git a/src/dummy/toga_dummy/widgets/button.py b/src/dummy/src/toga_dummy/widgets/button.py similarity index 100% rename from src/dummy/toga_dummy/widgets/button.py rename to src/dummy/src/toga_dummy/widgets/button.py diff --git a/src/dummy/toga_dummy/widgets/canvas.py b/src/dummy/src/toga_dummy/widgets/canvas.py similarity index 100% rename from src/dummy/toga_dummy/widgets/canvas.py rename to src/dummy/src/toga_dummy/widgets/canvas.py diff --git a/src/dummy/toga_dummy/widgets/datepicker.py b/src/dummy/src/toga_dummy/widgets/datepicker.py similarity index 100% rename from src/dummy/toga_dummy/widgets/datepicker.py rename to src/dummy/src/toga_dummy/widgets/datepicker.py diff --git a/src/dummy/toga_dummy/widgets/detailedlist.py b/src/dummy/src/toga_dummy/widgets/detailedlist.py similarity index 100% rename from src/dummy/toga_dummy/widgets/detailedlist.py rename to src/dummy/src/toga_dummy/widgets/detailedlist.py diff --git a/src/dummy/toga_dummy/widgets/divider.py b/src/dummy/src/toga_dummy/widgets/divider.py similarity index 100% rename from src/dummy/toga_dummy/widgets/divider.py rename to src/dummy/src/toga_dummy/widgets/divider.py diff --git a/src/dummy/toga_dummy/widgets/imageview.py b/src/dummy/src/toga_dummy/widgets/imageview.py similarity index 100% rename from src/dummy/toga_dummy/widgets/imageview.py rename to src/dummy/src/toga_dummy/widgets/imageview.py diff --git a/src/dummy/toga_dummy/widgets/label.py b/src/dummy/src/toga_dummy/widgets/label.py similarity index 100% rename from src/dummy/toga_dummy/widgets/label.py rename to src/dummy/src/toga_dummy/widgets/label.py diff --git a/src/dummy/toga_dummy/widgets/multilinetextinput.py b/src/dummy/src/toga_dummy/widgets/multilinetextinput.py similarity index 100% rename from src/dummy/toga_dummy/widgets/multilinetextinput.py rename to src/dummy/src/toga_dummy/widgets/multilinetextinput.py diff --git a/src/dummy/toga_dummy/widgets/navigationview.py b/src/dummy/src/toga_dummy/widgets/navigationview.py similarity index 100% rename from src/dummy/toga_dummy/widgets/navigationview.py rename to src/dummy/src/toga_dummy/widgets/navigationview.py diff --git a/src/dummy/toga_dummy/widgets/numberinput.py b/src/dummy/src/toga_dummy/widgets/numberinput.py similarity index 100% rename from src/dummy/toga_dummy/widgets/numberinput.py rename to src/dummy/src/toga_dummy/widgets/numberinput.py diff --git a/src/dummy/toga_dummy/widgets/optioncontainer.py b/src/dummy/src/toga_dummy/widgets/optioncontainer.py similarity index 100% rename from src/dummy/toga_dummy/widgets/optioncontainer.py rename to src/dummy/src/toga_dummy/widgets/optioncontainer.py diff --git a/src/dummy/toga_dummy/widgets/passwordinput.py b/src/dummy/src/toga_dummy/widgets/passwordinput.py similarity index 100% rename from src/dummy/toga_dummy/widgets/passwordinput.py rename to src/dummy/src/toga_dummy/widgets/passwordinput.py diff --git a/src/dummy/toga_dummy/widgets/progressbar.py b/src/dummy/src/toga_dummy/widgets/progressbar.py similarity index 100% rename from src/dummy/toga_dummy/widgets/progressbar.py rename to src/dummy/src/toga_dummy/widgets/progressbar.py diff --git a/src/dummy/toga_dummy/widgets/scrollcontainer.py b/src/dummy/src/toga_dummy/widgets/scrollcontainer.py similarity index 100% rename from src/dummy/toga_dummy/widgets/scrollcontainer.py rename to src/dummy/src/toga_dummy/widgets/scrollcontainer.py diff --git a/src/dummy/toga_dummy/widgets/selection.py b/src/dummy/src/toga_dummy/widgets/selection.py similarity index 100% rename from src/dummy/toga_dummy/widgets/selection.py rename to src/dummy/src/toga_dummy/widgets/selection.py diff --git a/src/dummy/toga_dummy/widgets/slider.py b/src/dummy/src/toga_dummy/widgets/slider.py similarity index 100% rename from src/dummy/toga_dummy/widgets/slider.py rename to src/dummy/src/toga_dummy/widgets/slider.py diff --git a/src/dummy/toga_dummy/widgets/splitcontainer.py b/src/dummy/src/toga_dummy/widgets/splitcontainer.py similarity index 100% rename from src/dummy/toga_dummy/widgets/splitcontainer.py rename to src/dummy/src/toga_dummy/widgets/splitcontainer.py diff --git a/src/dummy/toga_dummy/widgets/switch.py b/src/dummy/src/toga_dummy/widgets/switch.py similarity index 100% rename from src/dummy/toga_dummy/widgets/switch.py rename to src/dummy/src/toga_dummy/widgets/switch.py diff --git a/src/dummy/toga_dummy/widgets/table.py b/src/dummy/src/toga_dummy/widgets/table.py similarity index 100% rename from src/dummy/toga_dummy/widgets/table.py rename to src/dummy/src/toga_dummy/widgets/table.py diff --git a/src/dummy/toga_dummy/widgets/textinput.py b/src/dummy/src/toga_dummy/widgets/textinput.py similarity index 100% rename from src/dummy/toga_dummy/widgets/textinput.py rename to src/dummy/src/toga_dummy/widgets/textinput.py diff --git a/src/dummy/toga_dummy/widgets/timepicker.py b/src/dummy/src/toga_dummy/widgets/timepicker.py similarity index 100% rename from src/dummy/toga_dummy/widgets/timepicker.py rename to src/dummy/src/toga_dummy/widgets/timepicker.py diff --git a/src/dummy/toga_dummy/widgets/tree.py b/src/dummy/src/toga_dummy/widgets/tree.py similarity index 100% rename from src/dummy/toga_dummy/widgets/tree.py rename to src/dummy/src/toga_dummy/widgets/tree.py diff --git a/src/dummy/toga_dummy/widgets/webview.py b/src/dummy/src/toga_dummy/widgets/webview.py similarity index 100% rename from src/dummy/toga_dummy/widgets/webview.py rename to src/dummy/src/toga_dummy/widgets/webview.py diff --git a/src/dummy/toga_dummy/window.py b/src/dummy/src/toga_dummy/window.py similarity index 100% rename from src/dummy/toga_dummy/window.py rename to src/dummy/src/toga_dummy/window.py diff --git a/tox.ini b/tox.ini index 3c3c1c1294..6eb3167cf4 100644 --- a/tox.ini +++ b/tox.ini @@ -18,9 +18,7 @@ whitelist_externals = bash commands: {env:TOGA_INSTALL_COMMAND:pip install -e src/core src/dummy} - # In CI, `--import-mode append` ensures we test the installed packages rather than the - # checked-out source code. - pytest src/core/tests --cov --cov-report term-missing --import-mode append {posargs} + pytest src/core/tests --cov --cov-report term-missing {posargs} coverage xml [testenv:flake8] From ba035e04ec48a7489889701f37d9016c4abafd28 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 14:19:12 +0100 Subject: [PATCH 10/19] Fix tox -e docs --- docs/conf.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index ab844ceab0..9202b1bfed 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, os.path.abspath('../src/core/')) +sys.path.insert(0, os.path.abspath('../src/core/src')) # -- General configuration ----------------------------------------------------- @@ -49,7 +49,7 @@ # built documents. # # The full version, including alpha/beta/rc tags. -with open('../src/core/toga/__init__.py', encoding='utf8') as version_file: +with open('../src/core/src/toga/__init__.py', encoding='utf8') as version_file: version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), re.M) if version_match: release = version_match.group(1) diff --git a/setup.py b/setup.py index bf9d444e1e..f8ab2243a0 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga to compute the version; # and to support versioned extra dependencies -with open('src/core/toga/__init__.py', encoding='utf8') as version_file: +with open('src/core/src/toga/__init__.py', encoding='utf8') as version_file: version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), re.M) if version_match: version = version_match.group(1) From 0a4dff28db796075de86af286a93b4bfbe78ec61 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 15:54:24 +0100 Subject: [PATCH 11/19] Update paths in coverage and docs --- .coveragerc | 2 +- docs/background/architecture.rst | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.coveragerc b/.coveragerc index 539bc897bb..1f39673284 100644 --- a/.coveragerc +++ b/.coveragerc @@ -8,7 +8,7 @@ omit = # Paths which may contain the packages listed in source_pkgs. The first path will be used # to generate the filenames in the report. source = - src/core + src/core/src **/site-packages [report] diff --git a/docs/background/architecture.rst b/docs/background/architecture.rst index 87f33ecf0e..208ef27bb7 100644 --- a/docs/background/architecture.rst +++ b/docs/background/architecture.rst @@ -91,7 +91,7 @@ An example Here's how Toga's three-layer API works on the Button widget. -* ``toga.Button`` is defined in ``src/core/toga/widgets/button.py``. This +* ``toga.Button`` is defined in ``src/core/src/toga/widgets/button.py``. This defines the public interface for the Button widget, describing (amongst other things) that there is an ``on_click`` event handler on a Button. It expects that there will be *an* implementation, but doesn't care which implementation diff --git a/tox.ini b/tox.ini index 6eb3167cf4..e85e6b6de2 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ deps = whitelist_externals = bash commands: - {env:TOGA_INSTALL_COMMAND:pip install -e src/core src/dummy} + {env:TOGA_INSTALL_COMMAND:pip install src/core src/dummy} pytest src/core/tests --cov --cov-report term-missing {posargs} coverage xml From 0d3c0f29d089eeed3174b709a3fc3d8bfa31f051 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 18:40:02 +0100 Subject: [PATCH 12/19] Make backends use src subdirectories --- .github/workflows/ci.yml | 93 +++++++++--------- MANIFEST.in | 12 ++- release.sh | 2 +- src/android/MANIFEST.in | 1 - src/android/setup.cfg | 8 +- src/android/setup.py | 2 +- .../{ => src}/toga_android/__init__.py | 0 src/android/{ => src}/toga_android/app.py | 0 src/android/{ => src}/toga_android/colors.py | 0 src/android/{ => src}/toga_android/command.py | 0 src/android/{ => src}/toga_android/dialogs.py | 0 src/android/{ => src}/toga_android/factory.py | 0 src/android/{ => src}/toga_android/fonts.py | 0 .../toga_android/hardware/__init__.py | 0 src/android/{ => src}/toga_android/icons.py | 0 src/android/{ => src}/toga_android/images.py | 0 .../{ => src}/toga_android/libs/__init__.py | 0 .../{ => src}/toga_android/libs/activity.py | 0 .../toga_android/libs/android/__init__.py | 0 .../toga_android/libs/android/app.py | 0 .../toga_android/libs/android/content.py | 0 .../toga_android/libs/android/graphics.py | 0 .../toga_android/libs/android/text.py | 0 .../toga_android/libs/android/util.py | 0 .../toga_android/libs/android/view.py | 0 .../toga_android/libs/android/webkit.py | 0 .../toga_android/libs/android/widget.py | 0 .../toga_android/libs/androidx/__init__.py | 0 .../libs/androidx/swiperefreshlayout.py | 0 src/android/{ => src}/toga_android/paths.py | 0 .../toga_android/widgets/__init__.py | 0 .../{ => src}/toga_android/widgets/base.py | 0 .../{ => src}/toga_android/widgets/box.py | 0 .../{ => src}/toga_android/widgets/button.py | 0 .../{ => src}/toga_android/widgets/canvas.py | 0 .../toga_android/widgets/datepicker.py | 0 .../toga_android/widgets/detailedlist.py | 0 .../toga_android/widgets/imageview.py | 0 .../toga_android/widgets/internal/__init__.py | 0 .../toga_android/widgets/internal/pickers.py | 0 .../{ => src}/toga_android/widgets/label.py | 0 .../widgets/multilinetextinput.py | 0 .../toga_android/widgets/numberinput.py | 0 .../toga_android/widgets/passwordinput.py | 0 .../toga_android/widgets/progressbar.py | 0 .../toga_android/widgets/scrollcontainer.py | 0 .../toga_android/widgets/selection.py | 0 .../{ => src}/toga_android/widgets/slider.py | 0 .../{ => src}/toga_android/widgets/switch.py | 0 .../{ => src}/toga_android/widgets/table.py | 0 .../toga_android/widgets/textinput.py | 0 .../toga_android/widgets/timepicker.py | 0 .../{ => src}/toga_android/widgets/webview.py | 0 src/android/{ => src}/toga_android/window.py | 0 src/cocoa/MANIFEST.in | 1 - src/cocoa/setup.cfg | 8 +- src/cocoa/setup.py | 2 +- src/cocoa/{ => src}/toga_cocoa/__init__.py | 0 src/cocoa/{ => src}/toga_cocoa/app.py | 0 src/cocoa/{ => src}/toga_cocoa/colors.py | 0 src/cocoa/{ => src}/toga_cocoa/command.py | 0 src/cocoa/{ => src}/toga_cocoa/constraints.py | 0 src/cocoa/{ => src}/toga_cocoa/dialogs.py | 0 src/cocoa/{ => src}/toga_cocoa/documents.py | 0 src/cocoa/{ => src}/toga_cocoa/factory.py | 0 src/cocoa/{ => src}/toga_cocoa/fonts.py | 0 .../{ => src}/toga_cocoa/hardware/__init__.py | 0 src/cocoa/{ => src}/toga_cocoa/icons.py | 0 src/cocoa/{ => src}/toga_cocoa/images.py | 0 src/cocoa/{ => src}/toga_cocoa/keys.py | 0 .../{ => src}/toga_cocoa/libs/__init__.py | 0 src/cocoa/{ => src}/toga_cocoa/libs/appkit.py | 0 .../toga_cocoa/libs/core_graphics.py | 0 .../{ => src}/toga_cocoa/libs/core_text.py | 0 .../{ => src}/toga_cocoa/libs/foundation.py | 0 src/cocoa/{ => src}/toga_cocoa/libs/webkit.py | 0 src/cocoa/{ => src}/toga_cocoa/paths.py | 0 .../toga_cocoa/resources/__init__.py | 0 .../{ => src}/toga_cocoa/widgets/__init__.py | 0 .../toga_cocoa/widgets/activityindicator.py | 0 .../{ => src}/toga_cocoa/widgets/base.py | 0 src/cocoa/{ => src}/toga_cocoa/widgets/box.py | 0 .../{ => src}/toga_cocoa/widgets/button.py | 0 .../{ => src}/toga_cocoa/widgets/canvas.py | 0 .../toga_cocoa/widgets/detailedlist.py | 0 .../{ => src}/toga_cocoa/widgets/divider.py | 0 .../{ => src}/toga_cocoa/widgets/imageview.py | 0 .../toga_cocoa/widgets/internal/__init__.py | 0 .../toga_cocoa/widgets/internal/cells.py | 0 .../toga_cocoa/widgets/internal/data.py | 0 .../toga_cocoa/widgets/internal/refresh.py | 0 .../{ => src}/toga_cocoa/widgets/label.py | 0 .../toga_cocoa/widgets/multilinetextinput.py | 0 .../toga_cocoa/widgets/numberinput.py | 0 .../toga_cocoa/widgets/optioncontainer.py | 0 .../toga_cocoa/widgets/passwordinput.py | 0 .../toga_cocoa/widgets/progressbar.py | 0 .../toga_cocoa/widgets/scrollcontainer.py | 0 .../{ => src}/toga_cocoa/widgets/selection.py | 0 .../{ => src}/toga_cocoa/widgets/slider.py | 0 .../toga_cocoa/widgets/splitcontainer.py | 0 .../{ => src}/toga_cocoa/widgets/switch.py | 0 .../{ => src}/toga_cocoa/widgets/table.py | 0 .../{ => src}/toga_cocoa/widgets/textinput.py | 0 .../{ => src}/toga_cocoa/widgets/tree.py | 0 .../{ => src}/toga_cocoa/widgets/webview.py | 0 src/cocoa/{ => src}/toga_cocoa/window.py | 0 src/gtk/MANIFEST.in | 1 - src/gtk/setup.cfg | 8 +- src/gtk/setup.py | 2 +- src/gtk/{ => src}/toga_gtk/__init__.py | 0 src/gtk/{ => src}/toga_gtk/app.py | 0 src/gtk/{ => src}/toga_gtk/colors.py | 0 src/gtk/{ => src}/toga_gtk/command.py | 0 src/gtk/{ => src}/toga_gtk/dialogs.py | 0 src/gtk/{ => src}/toga_gtk/documents.py | 0 src/gtk/{ => src}/toga_gtk/factory.py | 0 src/gtk/{ => src}/toga_gtk/fonts.py | 0 .../{ => src}/toga_gtk/hardware/__init__.py | 0 src/gtk/{ => src}/toga_gtk/icons.py | 0 src/gtk/{ => src}/toga_gtk/images.py | 0 src/gtk/{ => src}/toga_gtk/keys.py | 0 src/gtk/{ => src}/toga_gtk/libs/__init__.py | 0 src/gtk/{ => src}/toga_gtk/libs/gtk.py | 0 src/gtk/{ => src}/toga_gtk/libs/styles.py | 0 src/gtk/{ => src}/toga_gtk/libs/utils.py | 0 src/gtk/{ => src}/toga_gtk/paths.py | 0 .../{ => src}/toga_gtk/widgets/__init__.py | 0 .../toga_gtk/widgets/activityindicator.py | 0 src/gtk/{ => src}/toga_gtk/widgets/base.py | 0 src/gtk/{ => src}/toga_gtk/widgets/box.py | 0 src/gtk/{ => src}/toga_gtk/widgets/button.py | 0 src/gtk/{ => src}/toga_gtk/widgets/canvas.py | 0 .../toga_gtk/widgets/detailedlist.py | 0 src/gtk/{ => src}/toga_gtk/widgets/divider.py | 0 .../{ => src}/toga_gtk/widgets/imageview.py | 0 .../toga_gtk/widgets/internal/__init__.py | 0 .../widgets/internal/buttons/__init__.py | 0 .../toga_gtk/widgets/internal/buttons/base.py | 0 .../widgets/internal/buttons/refresh.py | 0 .../widgets/internal/buttons/scroll.py | 0 .../widgets/internal/rows/__init__.py | 0 .../toga_gtk/widgets/internal/rows/base.py | 0 .../widgets/internal/rows/scrollable.py | 0 .../widgets/internal/rows/texticon.py | 0 .../widgets/internal/sourcetreemodel.py | 0 src/gtk/{ => src}/toga_gtk/widgets/label.py | 0 .../toga_gtk/widgets/multilinetextinput.py | 0 .../{ => src}/toga_gtk/widgets/numberinput.py | 0 .../toga_gtk/widgets/optioncontainer.py | 0 .../toga_gtk/widgets/passwordinput.py | 0 .../{ => src}/toga_gtk/widgets/progressbar.py | 0 .../toga_gtk/widgets/scrollcontainer.py | 0 .../{ => src}/toga_gtk/widgets/selection.py | 0 src/gtk/{ => src}/toga_gtk/widgets/slider.py | 0 .../toga_gtk/widgets/splitcontainer.py | 0 src/gtk/{ => src}/toga_gtk/widgets/switch.py | 0 src/gtk/{ => src}/toga_gtk/widgets/table.py | 0 .../{ => src}/toga_gtk/widgets/textinput.py | 0 src/gtk/{ => src}/toga_gtk/widgets/tree.py | 0 src/gtk/{ => src}/toga_gtk/widgets/webview.py | 0 src/gtk/{ => src}/toga_gtk/window.py | 0 src/iOS/MANIFEST.in | 1 - src/iOS/setup.cfg | 8 +- src/iOS/setup.py | 2 +- src/iOS/{ => src}/toga_iOS/__init__.py | 0 src/iOS/{ => src}/toga_iOS/app.py | 0 src/iOS/{ => src}/toga_iOS/colors.py | 0 src/iOS/{ => src}/toga_iOS/constraints.py | 0 src/iOS/{ => src}/toga_iOS/dialogs.py | 0 src/iOS/{ => src}/toga_iOS/factory.py | 0 src/iOS/{ => src}/toga_iOS/fonts.py | 0 .../{ => src}/toga_iOS/hardware/__init__.py | 0 src/iOS/{ => src}/toga_iOS/icons.py | 0 src/iOS/{ => src}/toga_iOS/images.py | 0 src/iOS/{ => src}/toga_iOS/libs/__init__.py | 0 .../{ => src}/toga_iOS/libs/core_graphics.py | 0 src/iOS/{ => src}/toga_iOS/libs/foundation.py | 0 src/iOS/{ => src}/toga_iOS/libs/uikit.py | 0 src/iOS/{ => src}/toga_iOS/libs/webkit.py | 0 src/iOS/{ => src}/toga_iOS/paths.py | 0 .../{ => src}/toga_iOS/widgets/__init__.py | 0 src/iOS/{ => src}/toga_iOS/widgets/base.py | 0 src/iOS/{ => src}/toga_iOS/widgets/box.py | 0 src/iOS/{ => src}/toga_iOS/widgets/button.py | 0 src/iOS/{ => src}/toga_iOS/widgets/canvas.py | 0 .../toga_iOS/widgets/detailedlist.py | 0 .../{ => src}/toga_iOS/widgets/imageview.py | 0 src/iOS/{ => src}/toga_iOS/widgets/label.py | 0 .../toga_iOS/widgets/multilinetextinput.py | 0 .../toga_iOS/widgets/navigationview.py | 0 .../{ => src}/toga_iOS/widgets/numberinput.py | 0 .../toga_iOS/widgets/passwordinput.py | 0 .../{ => src}/toga_iOS/widgets/progressbar.py | 0 .../toga_iOS/widgets/scrollcontainer.py | 0 .../{ => src}/toga_iOS/widgets/selection.py | 0 src/iOS/{ => src}/toga_iOS/widgets/slider.py | 0 src/iOS/{ => src}/toga_iOS/widgets/switch.py | 0 .../{ => src}/toga_iOS/widgets/textinput.py | 0 src/iOS/{ => src}/toga_iOS/widgets/webview.py | 0 src/iOS/{ => src}/toga_iOS/window.py | 0 src/web/MANIFEST.in | 2 - src/web/setup.cfg | 11 +-- src/web/setup.py | 2 +- src/web/{ => src}/toga_web/__init__.py | 0 src/web/{ => src}/toga_web/app.py | 0 src/web/{ => src}/toga_web/command.py | 0 src/web/{ => src}/toga_web/dialogs.py | 0 src/web/{ => src}/toga_web/factory.py | 0 src/web/{ => src}/toga_web/icons.py | 0 src/web/{ => src}/toga_web/libs.py | 0 src/web/{ => src}/toga_web/paths.py | 0 src/web/{ => src}/toga_web/static/toga.css | 0 .../{ => src}/toga_web/widgets/__init__.py | 0 src/web/{ => src}/toga_web/widgets/base.py | 0 src/web/{ => src}/toga_web/widgets/box.py | 0 src/web/{ => src}/toga_web/widgets/button.py | 0 src/web/{ => src}/toga_web/widgets/label.py | 0 .../{ => src}/toga_web/widgets/textinput.py | 0 src/web/{ => src}/toga_web/window.py | 0 src/winforms/MANIFEST.in | 4 - src/winforms/setup.cfg | 16 +-- src/winforms/setup.py | 2 +- .../{ => src}/toga_winforms/__init__.py | 0 src/winforms/{ => src}/toga_winforms/app.py | 0 .../{ => src}/toga_winforms/colors.py | 0 .../{ => src}/toga_winforms/command.py | 0 .../{ => src}/toga_winforms/dialogs.py | 0 .../{ => src}/toga_winforms/factory.py | 0 src/winforms/{ => src}/toga_winforms/fonts.py | 0 .../toga_winforms/hardware/__init__.py | 0 src/winforms/{ => src}/toga_winforms/icons.py | 0 .../{ => src}/toga_winforms/images.py | 0 src/winforms/{ => src}/toga_winforms/keys.py | 0 .../toga_winforms/libs/WebView2/LICENSE.md | 0 .../WebView2/Microsoft.Web.WebView2.Core.dll | Bin .../Microsoft.Web.WebView2.WinForms.dll | Bin .../toga_winforms/libs/WebView2/README.md | 0 .../libs/WebView2/arm64/WebView2Loader.dll | Bin .../libs/WebView2/x64/WebView2Loader.dll | Bin .../libs/WebView2/x86/WebView2Loader.dll | Bin .../{ => src}/toga_winforms/libs/__init__.py | 0 .../toga_winforms/libs/extensions.py | 0 .../{ => src}/toga_winforms/libs/fonts.py | 0 .../{ => src}/toga_winforms/libs/proactor.py | 0 .../{ => src}/toga_winforms/libs/winforms.py | 0 src/winforms/{ => src}/toga_winforms/paths.py | 0 .../toga_winforms/widgets/__init__.py | 0 .../{ => src}/toga_winforms/widgets/base.py | 0 .../{ => src}/toga_winforms/widgets/box.py | 0 .../{ => src}/toga_winforms/widgets/button.py | 0 .../{ => src}/toga_winforms/widgets/canvas.py | 0 .../toga_winforms/widgets/datepicker.py | 0 .../toga_winforms/widgets/detailedlist.py | 0 .../toga_winforms/widgets/divider.py | 0 .../toga_winforms/widgets/imageview.py | 0 .../{ => src}/toga_winforms/widgets/label.py | 0 .../widgets/multilinetextinput.py | 0 .../toga_winforms/widgets/numberinput.py | 0 .../toga_winforms/widgets/optioncontainer.py | 0 .../toga_winforms/widgets/passwordinput.py | 0 .../toga_winforms/widgets/progressbar.py | 0 .../toga_winforms/widgets/scrollcontainer.py | 0 .../toga_winforms/widgets/selection.py | 0 .../{ => src}/toga_winforms/widgets/slider.py | 0 .../toga_winforms/widgets/splitcontainer.py | 0 .../{ => src}/toga_winforms/widgets/switch.py | 0 .../{ => src}/toga_winforms/widgets/table.py | 0 .../toga_winforms/widgets/textinput.py | 0 .../toga_winforms/widgets/timepicker.py | 0 .../{ => src}/toga_winforms/widgets/tree.py | 0 .../toga_winforms/widgets/webview.py | 0 .../{ => src}/toga_winforms/window.py | 0 273 files changed, 76 insertions(+), 112 deletions(-) rename src/android/{ => src}/toga_android/__init__.py (100%) rename src/android/{ => src}/toga_android/app.py (100%) rename src/android/{ => src}/toga_android/colors.py (100%) rename src/android/{ => src}/toga_android/command.py (100%) rename src/android/{ => src}/toga_android/dialogs.py (100%) rename src/android/{ => src}/toga_android/factory.py (100%) rename src/android/{ => src}/toga_android/fonts.py (100%) rename src/android/{ => src}/toga_android/hardware/__init__.py (100%) rename src/android/{ => src}/toga_android/icons.py (100%) rename src/android/{ => src}/toga_android/images.py (100%) rename src/android/{ => src}/toga_android/libs/__init__.py (100%) rename src/android/{ => src}/toga_android/libs/activity.py (100%) rename src/android/{ => src}/toga_android/libs/android/__init__.py (100%) rename src/android/{ => src}/toga_android/libs/android/app.py (100%) rename src/android/{ => src}/toga_android/libs/android/content.py (100%) rename src/android/{ => src}/toga_android/libs/android/graphics.py (100%) rename src/android/{ => src}/toga_android/libs/android/text.py (100%) rename src/android/{ => src}/toga_android/libs/android/util.py (100%) rename src/android/{ => src}/toga_android/libs/android/view.py (100%) rename src/android/{ => src}/toga_android/libs/android/webkit.py (100%) rename src/android/{ => src}/toga_android/libs/android/widget.py (100%) rename src/android/{ => src}/toga_android/libs/androidx/__init__.py (100%) rename src/android/{ => src}/toga_android/libs/androidx/swiperefreshlayout.py (100%) rename src/android/{ => src}/toga_android/paths.py (100%) rename src/android/{ => src}/toga_android/widgets/__init__.py (100%) rename src/android/{ => src}/toga_android/widgets/base.py (100%) rename src/android/{ => src}/toga_android/widgets/box.py (100%) rename src/android/{ => src}/toga_android/widgets/button.py (100%) rename src/android/{ => src}/toga_android/widgets/canvas.py (100%) rename src/android/{ => src}/toga_android/widgets/datepicker.py (100%) rename src/android/{ => src}/toga_android/widgets/detailedlist.py (100%) rename src/android/{ => src}/toga_android/widgets/imageview.py (100%) rename src/android/{ => src}/toga_android/widgets/internal/__init__.py (100%) rename src/android/{ => src}/toga_android/widgets/internal/pickers.py (100%) rename src/android/{ => src}/toga_android/widgets/label.py (100%) rename src/android/{ => src}/toga_android/widgets/multilinetextinput.py (100%) rename src/android/{ => src}/toga_android/widgets/numberinput.py (100%) rename src/android/{ => src}/toga_android/widgets/passwordinput.py (100%) rename src/android/{ => src}/toga_android/widgets/progressbar.py (100%) rename src/android/{ => src}/toga_android/widgets/scrollcontainer.py (100%) rename src/android/{ => src}/toga_android/widgets/selection.py (100%) rename src/android/{ => src}/toga_android/widgets/slider.py (100%) rename src/android/{ => src}/toga_android/widgets/switch.py (100%) rename src/android/{ => src}/toga_android/widgets/table.py (100%) rename src/android/{ => src}/toga_android/widgets/textinput.py (100%) rename src/android/{ => src}/toga_android/widgets/timepicker.py (100%) rename src/android/{ => src}/toga_android/widgets/webview.py (100%) rename src/android/{ => src}/toga_android/window.py (100%) rename src/cocoa/{ => src}/toga_cocoa/__init__.py (100%) rename src/cocoa/{ => src}/toga_cocoa/app.py (100%) rename src/cocoa/{ => src}/toga_cocoa/colors.py (100%) rename src/cocoa/{ => src}/toga_cocoa/command.py (100%) rename src/cocoa/{ => src}/toga_cocoa/constraints.py (100%) rename src/cocoa/{ => src}/toga_cocoa/dialogs.py (100%) rename src/cocoa/{ => src}/toga_cocoa/documents.py (100%) rename src/cocoa/{ => src}/toga_cocoa/factory.py (100%) rename src/cocoa/{ => src}/toga_cocoa/fonts.py (100%) rename src/cocoa/{ => src}/toga_cocoa/hardware/__init__.py (100%) rename src/cocoa/{ => src}/toga_cocoa/icons.py (100%) rename src/cocoa/{ => src}/toga_cocoa/images.py (100%) rename src/cocoa/{ => src}/toga_cocoa/keys.py (100%) rename src/cocoa/{ => src}/toga_cocoa/libs/__init__.py (100%) rename src/cocoa/{ => src}/toga_cocoa/libs/appkit.py (100%) rename src/cocoa/{ => src}/toga_cocoa/libs/core_graphics.py (100%) rename src/cocoa/{ => src}/toga_cocoa/libs/core_text.py (100%) rename src/cocoa/{ => src}/toga_cocoa/libs/foundation.py (100%) rename src/cocoa/{ => src}/toga_cocoa/libs/webkit.py (100%) rename src/cocoa/{ => src}/toga_cocoa/paths.py (100%) rename src/cocoa/{ => src}/toga_cocoa/resources/__init__.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/__init__.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/activityindicator.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/base.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/box.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/button.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/canvas.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/detailedlist.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/divider.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/imageview.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/internal/__init__.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/internal/cells.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/internal/data.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/internal/refresh.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/label.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/multilinetextinput.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/numberinput.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/optioncontainer.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/passwordinput.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/progressbar.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/scrollcontainer.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/selection.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/slider.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/splitcontainer.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/switch.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/table.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/textinput.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/tree.py (100%) rename src/cocoa/{ => src}/toga_cocoa/widgets/webview.py (100%) rename src/cocoa/{ => src}/toga_cocoa/window.py (100%) rename src/gtk/{ => src}/toga_gtk/__init__.py (100%) rename src/gtk/{ => src}/toga_gtk/app.py (100%) rename src/gtk/{ => src}/toga_gtk/colors.py (100%) rename src/gtk/{ => src}/toga_gtk/command.py (100%) rename src/gtk/{ => src}/toga_gtk/dialogs.py (100%) rename src/gtk/{ => src}/toga_gtk/documents.py (100%) rename src/gtk/{ => src}/toga_gtk/factory.py (100%) rename src/gtk/{ => src}/toga_gtk/fonts.py (100%) rename src/gtk/{ => src}/toga_gtk/hardware/__init__.py (100%) rename src/gtk/{ => src}/toga_gtk/icons.py (100%) rename src/gtk/{ => src}/toga_gtk/images.py (100%) rename src/gtk/{ => src}/toga_gtk/keys.py (100%) rename src/gtk/{ => src}/toga_gtk/libs/__init__.py (100%) rename src/gtk/{ => src}/toga_gtk/libs/gtk.py (100%) rename src/gtk/{ => src}/toga_gtk/libs/styles.py (100%) rename src/gtk/{ => src}/toga_gtk/libs/utils.py (100%) rename src/gtk/{ => src}/toga_gtk/paths.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/__init__.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/activityindicator.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/base.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/box.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/button.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/canvas.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/detailedlist.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/divider.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/imageview.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/__init__.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/buttons/__init__.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/buttons/base.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/buttons/refresh.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/buttons/scroll.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/rows/__init__.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/rows/base.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/rows/scrollable.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/rows/texticon.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/internal/sourcetreemodel.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/label.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/multilinetextinput.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/numberinput.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/optioncontainer.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/passwordinput.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/progressbar.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/scrollcontainer.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/selection.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/slider.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/splitcontainer.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/switch.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/table.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/textinput.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/tree.py (100%) rename src/gtk/{ => src}/toga_gtk/widgets/webview.py (100%) rename src/gtk/{ => src}/toga_gtk/window.py (100%) rename src/iOS/{ => src}/toga_iOS/__init__.py (100%) rename src/iOS/{ => src}/toga_iOS/app.py (100%) rename src/iOS/{ => src}/toga_iOS/colors.py (100%) rename src/iOS/{ => src}/toga_iOS/constraints.py (100%) rename src/iOS/{ => src}/toga_iOS/dialogs.py (100%) rename src/iOS/{ => src}/toga_iOS/factory.py (100%) rename src/iOS/{ => src}/toga_iOS/fonts.py (100%) rename src/iOS/{ => src}/toga_iOS/hardware/__init__.py (100%) rename src/iOS/{ => src}/toga_iOS/icons.py (100%) rename src/iOS/{ => src}/toga_iOS/images.py (100%) rename src/iOS/{ => src}/toga_iOS/libs/__init__.py (100%) rename src/iOS/{ => src}/toga_iOS/libs/core_graphics.py (100%) rename src/iOS/{ => src}/toga_iOS/libs/foundation.py (100%) rename src/iOS/{ => src}/toga_iOS/libs/uikit.py (100%) rename src/iOS/{ => src}/toga_iOS/libs/webkit.py (100%) rename src/iOS/{ => src}/toga_iOS/paths.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/__init__.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/base.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/box.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/button.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/canvas.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/detailedlist.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/imageview.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/label.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/multilinetextinput.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/navigationview.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/numberinput.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/passwordinput.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/progressbar.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/scrollcontainer.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/selection.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/slider.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/switch.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/textinput.py (100%) rename src/iOS/{ => src}/toga_iOS/widgets/webview.py (100%) rename src/iOS/{ => src}/toga_iOS/window.py (100%) rename src/web/{ => src}/toga_web/__init__.py (100%) rename src/web/{ => src}/toga_web/app.py (100%) rename src/web/{ => src}/toga_web/command.py (100%) rename src/web/{ => src}/toga_web/dialogs.py (100%) rename src/web/{ => src}/toga_web/factory.py (100%) rename src/web/{ => src}/toga_web/icons.py (100%) rename src/web/{ => src}/toga_web/libs.py (100%) rename src/web/{ => src}/toga_web/paths.py (100%) rename src/web/{ => src}/toga_web/static/toga.css (100%) rename src/web/{ => src}/toga_web/widgets/__init__.py (100%) rename src/web/{ => src}/toga_web/widgets/base.py (100%) rename src/web/{ => src}/toga_web/widgets/box.py (100%) rename src/web/{ => src}/toga_web/widgets/button.py (100%) rename src/web/{ => src}/toga_web/widgets/label.py (100%) rename src/web/{ => src}/toga_web/widgets/textinput.py (100%) rename src/web/{ => src}/toga_web/window.py (100%) rename src/winforms/{ => src}/toga_winforms/__init__.py (100%) rename src/winforms/{ => src}/toga_winforms/app.py (100%) rename src/winforms/{ => src}/toga_winforms/colors.py (100%) rename src/winforms/{ => src}/toga_winforms/command.py (100%) rename src/winforms/{ => src}/toga_winforms/dialogs.py (100%) rename src/winforms/{ => src}/toga_winforms/factory.py (100%) rename src/winforms/{ => src}/toga_winforms/fonts.py (100%) rename src/winforms/{ => src}/toga_winforms/hardware/__init__.py (100%) rename src/winforms/{ => src}/toga_winforms/icons.py (100%) rename src/winforms/{ => src}/toga_winforms/images.py (100%) rename src/winforms/{ => src}/toga_winforms/keys.py (100%) rename src/winforms/{ => src}/toga_winforms/libs/WebView2/LICENSE.md (100%) rename src/winforms/{ => src}/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.Core.dll (100%) rename src/winforms/{ => src}/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.WinForms.dll (100%) rename src/winforms/{ => src}/toga_winforms/libs/WebView2/README.md (100%) rename src/winforms/{ => src}/toga_winforms/libs/WebView2/arm64/WebView2Loader.dll (100%) rename src/winforms/{ => src}/toga_winforms/libs/WebView2/x64/WebView2Loader.dll (100%) rename src/winforms/{ => src}/toga_winforms/libs/WebView2/x86/WebView2Loader.dll (100%) rename src/winforms/{ => src}/toga_winforms/libs/__init__.py (100%) rename src/winforms/{ => src}/toga_winforms/libs/extensions.py (100%) rename src/winforms/{ => src}/toga_winforms/libs/fonts.py (100%) rename src/winforms/{ => src}/toga_winforms/libs/proactor.py (100%) rename src/winforms/{ => src}/toga_winforms/libs/winforms.py (100%) rename src/winforms/{ => src}/toga_winforms/paths.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/__init__.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/base.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/box.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/button.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/canvas.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/datepicker.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/detailedlist.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/divider.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/imageview.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/label.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/multilinetextinput.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/numberinput.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/optioncontainer.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/passwordinput.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/progressbar.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/scrollcontainer.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/selection.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/slider.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/splitcontainer.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/switch.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/table.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/textinput.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/timepicker.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/tree.py (100%) rename src/winforms/{ => src}/toga_winforms/widgets/webview.py (100%) rename src/winforms/{ => src}/toga_winforms/window.py (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2407ca7e2d..04201bebed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,50 +77,49 @@ jobs: flags: unittests fail_ci_if_error: true - # FIXME - # backend: - # needs: beefore - # strategy: - # matrix: - # backend: [android, cocoa, gtk, iOS, web, winforms] - # include: - # - runs-on: ubuntu-latest - # - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) - # - pre-command: - # - test-command: pytest - # - backend: cocoa - # runs-on: macos-latest - # - backend: gtk - # pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" - # test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" - # - 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" - # runs-on: ${{ matrix.runs-on }} - # steps: - # - uses: actions/checkout@v1 - # - name: Set up Python ${{ matrix.python-version }} - # uses: actions/setup-python@v3.1.2 - # with: - # # Py3.9 is the first Python version for which - # # a wheel of pythonnet isn't available on PyPI. - # python-version: ${{ matrix.python-version }} - # - name: Get packages - # uses: actions/download-artifact@v3 - # with: - # name: packages - # - name: Install dependencies - # run: | - # ${{ matrix.pre-command }} - # python -m pip install --upgrade pip - # python -m pip install --upgrade setuptools - # python -m pip install pytest-tldr - # python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl - # - name: Test - # run: | - # cd src/${{ matrix.backend }} - # ${{ matrix.test-command }} + backend: + needs: beefore + strategy: + matrix: + backend: [android, cocoa, gtk, iOS, web, winforms] + include: + - runs-on: ubuntu-latest + - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) + - pre-command: + - test-command: pytest + - backend: cocoa + runs-on: macos-latest + - backend: gtk + pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" + test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" + - 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" + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3.1.2 + with: + # Py3.9 is the first Python version for which + # a wheel of pythonnet isn't available on PyPI. + python-version: ${{ matrix.python-version }} + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages + - name: Install dependencies + run: | + ${{ matrix.pre-command }} + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools + python -m pip install pytest-tldr + python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl + - name: Test + run: | + cd src/${{ matrix.backend }} + ${{ matrix.test-command }} diff --git a/MANIFEST.in b/MANIFEST.in index 08ebbda00a..7429ee89ed 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -38,9 +38,15 @@ recursive-include examples *.css recursive-include examples *.html recursive-include examples README prune examples/*/.vscode +prune examples/*/android +prune examples/*/cocoa +prune examples/*/gtk +prune examples/*/iOS +prune examples/*/web +prune examples/*/winforms -include src/winforms/toga_winforms/libs/WebView2/LICENSE.md -include src/winforms/toga_winforms/libs/WebView2/README.md +include src/winforms/src/toga_winforms/libs/WebView2/LICENSE.md +include src/winforms/src/toga_winforms/libs/WebView2/README.md recursive-include src *.css recursive-include src *.html recursive-include src *.icns @@ -52,7 +58,7 @@ recursive-include src *.rst recursive-include src CONTRIBUTING.md recursive-include src LICENSE recursive-include src MANIFEST.in -recursive-include src/winforms/toga_winforms/libs/WebView2 *.dll +recursive-include src/winforms/src/toga_winforms/libs/WebView2 *.dll prune src/*/build prune src/*/.eggs diff --git a/release.sh b/release.sh index 0ea0a3a2a8..7fec854977 100755 --- a/release.sh +++ b/release.sh @@ -91,7 +91,7 @@ function install { } -MODULES="core dummy" # FIXME android cocoa core dummy gtk iOS web winforms toga demo +MODULES="android cocoa core dummy gtk iOS web winforms toga demo" action=$1 shift diff --git a/src/android/MANIFEST.in b/src/android/MANIFEST.in index 5fdb894d07..ecd14299d5 100644 --- a/src/android/MANIFEST.in +++ b/src/android/MANIFEST.in @@ -2,4 +2,3 @@ include CONTRIBUTING.md include LICENSE include README.rst recursive-include tests *.py -recursive-include toga_android *.py diff --git a/src/android/setup.cfg b/src/android/setup.cfg index 098f6a227b..2ee5bfc536 100644 --- a/src/android/setup.cfg +++ b/src/android/setup.cfg @@ -38,15 +38,11 @@ keywords = android [options] -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False -[options.packages.find] -include = - toga_android - toga_android.* - [flake8] exclude=\ .eggs/*,\ diff --git a/src/android/setup.py b/src/android/setup.py index 1069e47ced..9bbf5714af 100644 --- a/src/android/setup.py +++ b/src/android/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga_android to compute the version; # and to support versioned subpackage dependencies -with open('toga_android/__init__.py', encoding='utf8') as version_file: +with open('src/toga_android/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/android/toga_android/__init__.py b/src/android/src/toga_android/__init__.py similarity index 100% rename from src/android/toga_android/__init__.py rename to src/android/src/toga_android/__init__.py diff --git a/src/android/toga_android/app.py b/src/android/src/toga_android/app.py similarity index 100% rename from src/android/toga_android/app.py rename to src/android/src/toga_android/app.py diff --git a/src/android/toga_android/colors.py b/src/android/src/toga_android/colors.py similarity index 100% rename from src/android/toga_android/colors.py rename to src/android/src/toga_android/colors.py diff --git a/src/android/toga_android/command.py b/src/android/src/toga_android/command.py similarity index 100% rename from src/android/toga_android/command.py rename to src/android/src/toga_android/command.py diff --git a/src/android/toga_android/dialogs.py b/src/android/src/toga_android/dialogs.py similarity index 100% rename from src/android/toga_android/dialogs.py rename to src/android/src/toga_android/dialogs.py diff --git a/src/android/toga_android/factory.py b/src/android/src/toga_android/factory.py similarity index 100% rename from src/android/toga_android/factory.py rename to src/android/src/toga_android/factory.py diff --git a/src/android/toga_android/fonts.py b/src/android/src/toga_android/fonts.py similarity index 100% rename from src/android/toga_android/fonts.py rename to src/android/src/toga_android/fonts.py diff --git a/src/android/toga_android/hardware/__init__.py b/src/android/src/toga_android/hardware/__init__.py similarity index 100% rename from src/android/toga_android/hardware/__init__.py rename to src/android/src/toga_android/hardware/__init__.py diff --git a/src/android/toga_android/icons.py b/src/android/src/toga_android/icons.py similarity index 100% rename from src/android/toga_android/icons.py rename to src/android/src/toga_android/icons.py diff --git a/src/android/toga_android/images.py b/src/android/src/toga_android/images.py similarity index 100% rename from src/android/toga_android/images.py rename to src/android/src/toga_android/images.py diff --git a/src/android/toga_android/libs/__init__.py b/src/android/src/toga_android/libs/__init__.py similarity index 100% rename from src/android/toga_android/libs/__init__.py rename to src/android/src/toga_android/libs/__init__.py diff --git a/src/android/toga_android/libs/activity.py b/src/android/src/toga_android/libs/activity.py similarity index 100% rename from src/android/toga_android/libs/activity.py rename to src/android/src/toga_android/libs/activity.py diff --git a/src/android/toga_android/libs/android/__init__.py b/src/android/src/toga_android/libs/android/__init__.py similarity index 100% rename from src/android/toga_android/libs/android/__init__.py rename to src/android/src/toga_android/libs/android/__init__.py diff --git a/src/android/toga_android/libs/android/app.py b/src/android/src/toga_android/libs/android/app.py similarity index 100% rename from src/android/toga_android/libs/android/app.py rename to src/android/src/toga_android/libs/android/app.py diff --git a/src/android/toga_android/libs/android/content.py b/src/android/src/toga_android/libs/android/content.py similarity index 100% rename from src/android/toga_android/libs/android/content.py rename to src/android/src/toga_android/libs/android/content.py diff --git a/src/android/toga_android/libs/android/graphics.py b/src/android/src/toga_android/libs/android/graphics.py similarity index 100% rename from src/android/toga_android/libs/android/graphics.py rename to src/android/src/toga_android/libs/android/graphics.py diff --git a/src/android/toga_android/libs/android/text.py b/src/android/src/toga_android/libs/android/text.py similarity index 100% rename from src/android/toga_android/libs/android/text.py rename to src/android/src/toga_android/libs/android/text.py diff --git a/src/android/toga_android/libs/android/util.py b/src/android/src/toga_android/libs/android/util.py similarity index 100% rename from src/android/toga_android/libs/android/util.py rename to src/android/src/toga_android/libs/android/util.py diff --git a/src/android/toga_android/libs/android/view.py b/src/android/src/toga_android/libs/android/view.py similarity index 100% rename from src/android/toga_android/libs/android/view.py rename to src/android/src/toga_android/libs/android/view.py diff --git a/src/android/toga_android/libs/android/webkit.py b/src/android/src/toga_android/libs/android/webkit.py similarity index 100% rename from src/android/toga_android/libs/android/webkit.py rename to src/android/src/toga_android/libs/android/webkit.py diff --git a/src/android/toga_android/libs/android/widget.py b/src/android/src/toga_android/libs/android/widget.py similarity index 100% rename from src/android/toga_android/libs/android/widget.py rename to src/android/src/toga_android/libs/android/widget.py diff --git a/src/android/toga_android/libs/androidx/__init__.py b/src/android/src/toga_android/libs/androidx/__init__.py similarity index 100% rename from src/android/toga_android/libs/androidx/__init__.py rename to src/android/src/toga_android/libs/androidx/__init__.py diff --git a/src/android/toga_android/libs/androidx/swiperefreshlayout.py b/src/android/src/toga_android/libs/androidx/swiperefreshlayout.py similarity index 100% rename from src/android/toga_android/libs/androidx/swiperefreshlayout.py rename to src/android/src/toga_android/libs/androidx/swiperefreshlayout.py diff --git a/src/android/toga_android/paths.py b/src/android/src/toga_android/paths.py similarity index 100% rename from src/android/toga_android/paths.py rename to src/android/src/toga_android/paths.py diff --git a/src/android/toga_android/widgets/__init__.py b/src/android/src/toga_android/widgets/__init__.py similarity index 100% rename from src/android/toga_android/widgets/__init__.py rename to src/android/src/toga_android/widgets/__init__.py diff --git a/src/android/toga_android/widgets/base.py b/src/android/src/toga_android/widgets/base.py similarity index 100% rename from src/android/toga_android/widgets/base.py rename to src/android/src/toga_android/widgets/base.py diff --git a/src/android/toga_android/widgets/box.py b/src/android/src/toga_android/widgets/box.py similarity index 100% rename from src/android/toga_android/widgets/box.py rename to src/android/src/toga_android/widgets/box.py diff --git a/src/android/toga_android/widgets/button.py b/src/android/src/toga_android/widgets/button.py similarity index 100% rename from src/android/toga_android/widgets/button.py rename to src/android/src/toga_android/widgets/button.py diff --git a/src/android/toga_android/widgets/canvas.py b/src/android/src/toga_android/widgets/canvas.py similarity index 100% rename from src/android/toga_android/widgets/canvas.py rename to src/android/src/toga_android/widgets/canvas.py diff --git a/src/android/toga_android/widgets/datepicker.py b/src/android/src/toga_android/widgets/datepicker.py similarity index 100% rename from src/android/toga_android/widgets/datepicker.py rename to src/android/src/toga_android/widgets/datepicker.py diff --git a/src/android/toga_android/widgets/detailedlist.py b/src/android/src/toga_android/widgets/detailedlist.py similarity index 100% rename from src/android/toga_android/widgets/detailedlist.py rename to src/android/src/toga_android/widgets/detailedlist.py diff --git a/src/android/toga_android/widgets/imageview.py b/src/android/src/toga_android/widgets/imageview.py similarity index 100% rename from src/android/toga_android/widgets/imageview.py rename to src/android/src/toga_android/widgets/imageview.py diff --git a/src/android/toga_android/widgets/internal/__init__.py b/src/android/src/toga_android/widgets/internal/__init__.py similarity index 100% rename from src/android/toga_android/widgets/internal/__init__.py rename to src/android/src/toga_android/widgets/internal/__init__.py diff --git a/src/android/toga_android/widgets/internal/pickers.py b/src/android/src/toga_android/widgets/internal/pickers.py similarity index 100% rename from src/android/toga_android/widgets/internal/pickers.py rename to src/android/src/toga_android/widgets/internal/pickers.py diff --git a/src/android/toga_android/widgets/label.py b/src/android/src/toga_android/widgets/label.py similarity index 100% rename from src/android/toga_android/widgets/label.py rename to src/android/src/toga_android/widgets/label.py diff --git a/src/android/toga_android/widgets/multilinetextinput.py b/src/android/src/toga_android/widgets/multilinetextinput.py similarity index 100% rename from src/android/toga_android/widgets/multilinetextinput.py rename to src/android/src/toga_android/widgets/multilinetextinput.py diff --git a/src/android/toga_android/widgets/numberinput.py b/src/android/src/toga_android/widgets/numberinput.py similarity index 100% rename from src/android/toga_android/widgets/numberinput.py rename to src/android/src/toga_android/widgets/numberinput.py diff --git a/src/android/toga_android/widgets/passwordinput.py b/src/android/src/toga_android/widgets/passwordinput.py similarity index 100% rename from src/android/toga_android/widgets/passwordinput.py rename to src/android/src/toga_android/widgets/passwordinput.py diff --git a/src/android/toga_android/widgets/progressbar.py b/src/android/src/toga_android/widgets/progressbar.py similarity index 100% rename from src/android/toga_android/widgets/progressbar.py rename to src/android/src/toga_android/widgets/progressbar.py diff --git a/src/android/toga_android/widgets/scrollcontainer.py b/src/android/src/toga_android/widgets/scrollcontainer.py similarity index 100% rename from src/android/toga_android/widgets/scrollcontainer.py rename to src/android/src/toga_android/widgets/scrollcontainer.py diff --git a/src/android/toga_android/widgets/selection.py b/src/android/src/toga_android/widgets/selection.py similarity index 100% rename from src/android/toga_android/widgets/selection.py rename to src/android/src/toga_android/widgets/selection.py diff --git a/src/android/toga_android/widgets/slider.py b/src/android/src/toga_android/widgets/slider.py similarity index 100% rename from src/android/toga_android/widgets/slider.py rename to src/android/src/toga_android/widgets/slider.py diff --git a/src/android/toga_android/widgets/switch.py b/src/android/src/toga_android/widgets/switch.py similarity index 100% rename from src/android/toga_android/widgets/switch.py rename to src/android/src/toga_android/widgets/switch.py diff --git a/src/android/toga_android/widgets/table.py b/src/android/src/toga_android/widgets/table.py similarity index 100% rename from src/android/toga_android/widgets/table.py rename to src/android/src/toga_android/widgets/table.py diff --git a/src/android/toga_android/widgets/textinput.py b/src/android/src/toga_android/widgets/textinput.py similarity index 100% rename from src/android/toga_android/widgets/textinput.py rename to src/android/src/toga_android/widgets/textinput.py diff --git a/src/android/toga_android/widgets/timepicker.py b/src/android/src/toga_android/widgets/timepicker.py similarity index 100% rename from src/android/toga_android/widgets/timepicker.py rename to src/android/src/toga_android/widgets/timepicker.py diff --git a/src/android/toga_android/widgets/webview.py b/src/android/src/toga_android/widgets/webview.py similarity index 100% rename from src/android/toga_android/widgets/webview.py rename to src/android/src/toga_android/widgets/webview.py diff --git a/src/android/toga_android/window.py b/src/android/src/toga_android/window.py similarity index 100% rename from src/android/toga_android/window.py rename to src/android/src/toga_android/window.py diff --git a/src/cocoa/MANIFEST.in b/src/cocoa/MANIFEST.in index 6679b99f5d..ecd14299d5 100644 --- a/src/cocoa/MANIFEST.in +++ b/src/cocoa/MANIFEST.in @@ -2,4 +2,3 @@ include CONTRIBUTING.md include LICENSE include README.rst recursive-include tests *.py -recursive-include toga_cocoa *.py diff --git a/src/cocoa/setup.cfg b/src/cocoa/setup.cfg index 481ec7d701..96d19fb20c 100644 --- a/src/cocoa/setup.cfg +++ b/src/cocoa/setup.cfg @@ -39,15 +39,11 @@ keywords = cocoa [options] -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False -[options.packages.find] -include = - toga_cocoa - toga_cocoa.* - [flake8] exclude=\ .eggs/*,\ diff --git a/src/cocoa/setup.py b/src/cocoa/setup.py index e8bbf2e2ce..6e4ffa18a2 100644 --- a/src/cocoa/setup.py +++ b/src/cocoa/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga_cocoa to compute the version; # and to support versioned subpackage dependencies -with open('toga_cocoa/__init__.py', encoding='utf8') as version_file: +with open('src/toga_cocoa/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/cocoa/toga_cocoa/__init__.py b/src/cocoa/src/toga_cocoa/__init__.py similarity index 100% rename from src/cocoa/toga_cocoa/__init__.py rename to src/cocoa/src/toga_cocoa/__init__.py diff --git a/src/cocoa/toga_cocoa/app.py b/src/cocoa/src/toga_cocoa/app.py similarity index 100% rename from src/cocoa/toga_cocoa/app.py rename to src/cocoa/src/toga_cocoa/app.py diff --git a/src/cocoa/toga_cocoa/colors.py b/src/cocoa/src/toga_cocoa/colors.py similarity index 100% rename from src/cocoa/toga_cocoa/colors.py rename to src/cocoa/src/toga_cocoa/colors.py diff --git a/src/cocoa/toga_cocoa/command.py b/src/cocoa/src/toga_cocoa/command.py similarity index 100% rename from src/cocoa/toga_cocoa/command.py rename to src/cocoa/src/toga_cocoa/command.py diff --git a/src/cocoa/toga_cocoa/constraints.py b/src/cocoa/src/toga_cocoa/constraints.py similarity index 100% rename from src/cocoa/toga_cocoa/constraints.py rename to src/cocoa/src/toga_cocoa/constraints.py diff --git a/src/cocoa/toga_cocoa/dialogs.py b/src/cocoa/src/toga_cocoa/dialogs.py similarity index 100% rename from src/cocoa/toga_cocoa/dialogs.py rename to src/cocoa/src/toga_cocoa/dialogs.py diff --git a/src/cocoa/toga_cocoa/documents.py b/src/cocoa/src/toga_cocoa/documents.py similarity index 100% rename from src/cocoa/toga_cocoa/documents.py rename to src/cocoa/src/toga_cocoa/documents.py diff --git a/src/cocoa/toga_cocoa/factory.py b/src/cocoa/src/toga_cocoa/factory.py similarity index 100% rename from src/cocoa/toga_cocoa/factory.py rename to src/cocoa/src/toga_cocoa/factory.py diff --git a/src/cocoa/toga_cocoa/fonts.py b/src/cocoa/src/toga_cocoa/fonts.py similarity index 100% rename from src/cocoa/toga_cocoa/fonts.py rename to src/cocoa/src/toga_cocoa/fonts.py diff --git a/src/cocoa/toga_cocoa/hardware/__init__.py b/src/cocoa/src/toga_cocoa/hardware/__init__.py similarity index 100% rename from src/cocoa/toga_cocoa/hardware/__init__.py rename to src/cocoa/src/toga_cocoa/hardware/__init__.py diff --git a/src/cocoa/toga_cocoa/icons.py b/src/cocoa/src/toga_cocoa/icons.py similarity index 100% rename from src/cocoa/toga_cocoa/icons.py rename to src/cocoa/src/toga_cocoa/icons.py diff --git a/src/cocoa/toga_cocoa/images.py b/src/cocoa/src/toga_cocoa/images.py similarity index 100% rename from src/cocoa/toga_cocoa/images.py rename to src/cocoa/src/toga_cocoa/images.py diff --git a/src/cocoa/toga_cocoa/keys.py b/src/cocoa/src/toga_cocoa/keys.py similarity index 100% rename from src/cocoa/toga_cocoa/keys.py rename to src/cocoa/src/toga_cocoa/keys.py diff --git a/src/cocoa/toga_cocoa/libs/__init__.py b/src/cocoa/src/toga_cocoa/libs/__init__.py similarity index 100% rename from src/cocoa/toga_cocoa/libs/__init__.py rename to src/cocoa/src/toga_cocoa/libs/__init__.py diff --git a/src/cocoa/toga_cocoa/libs/appkit.py b/src/cocoa/src/toga_cocoa/libs/appkit.py similarity index 100% rename from src/cocoa/toga_cocoa/libs/appkit.py rename to src/cocoa/src/toga_cocoa/libs/appkit.py diff --git a/src/cocoa/toga_cocoa/libs/core_graphics.py b/src/cocoa/src/toga_cocoa/libs/core_graphics.py similarity index 100% rename from src/cocoa/toga_cocoa/libs/core_graphics.py rename to src/cocoa/src/toga_cocoa/libs/core_graphics.py diff --git a/src/cocoa/toga_cocoa/libs/core_text.py b/src/cocoa/src/toga_cocoa/libs/core_text.py similarity index 100% rename from src/cocoa/toga_cocoa/libs/core_text.py rename to src/cocoa/src/toga_cocoa/libs/core_text.py diff --git a/src/cocoa/toga_cocoa/libs/foundation.py b/src/cocoa/src/toga_cocoa/libs/foundation.py similarity index 100% rename from src/cocoa/toga_cocoa/libs/foundation.py rename to src/cocoa/src/toga_cocoa/libs/foundation.py diff --git a/src/cocoa/toga_cocoa/libs/webkit.py b/src/cocoa/src/toga_cocoa/libs/webkit.py similarity index 100% rename from src/cocoa/toga_cocoa/libs/webkit.py rename to src/cocoa/src/toga_cocoa/libs/webkit.py diff --git a/src/cocoa/toga_cocoa/paths.py b/src/cocoa/src/toga_cocoa/paths.py similarity index 100% rename from src/cocoa/toga_cocoa/paths.py rename to src/cocoa/src/toga_cocoa/paths.py diff --git a/src/cocoa/toga_cocoa/resources/__init__.py b/src/cocoa/src/toga_cocoa/resources/__init__.py similarity index 100% rename from src/cocoa/toga_cocoa/resources/__init__.py rename to src/cocoa/src/toga_cocoa/resources/__init__.py diff --git a/src/cocoa/toga_cocoa/widgets/__init__.py b/src/cocoa/src/toga_cocoa/widgets/__init__.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/__init__.py rename to src/cocoa/src/toga_cocoa/widgets/__init__.py diff --git a/src/cocoa/toga_cocoa/widgets/activityindicator.py b/src/cocoa/src/toga_cocoa/widgets/activityindicator.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/activityindicator.py rename to src/cocoa/src/toga_cocoa/widgets/activityindicator.py diff --git a/src/cocoa/toga_cocoa/widgets/base.py b/src/cocoa/src/toga_cocoa/widgets/base.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/base.py rename to src/cocoa/src/toga_cocoa/widgets/base.py diff --git a/src/cocoa/toga_cocoa/widgets/box.py b/src/cocoa/src/toga_cocoa/widgets/box.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/box.py rename to src/cocoa/src/toga_cocoa/widgets/box.py diff --git a/src/cocoa/toga_cocoa/widgets/button.py b/src/cocoa/src/toga_cocoa/widgets/button.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/button.py rename to src/cocoa/src/toga_cocoa/widgets/button.py diff --git a/src/cocoa/toga_cocoa/widgets/canvas.py b/src/cocoa/src/toga_cocoa/widgets/canvas.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/canvas.py rename to src/cocoa/src/toga_cocoa/widgets/canvas.py diff --git a/src/cocoa/toga_cocoa/widgets/detailedlist.py b/src/cocoa/src/toga_cocoa/widgets/detailedlist.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/detailedlist.py rename to src/cocoa/src/toga_cocoa/widgets/detailedlist.py diff --git a/src/cocoa/toga_cocoa/widgets/divider.py b/src/cocoa/src/toga_cocoa/widgets/divider.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/divider.py rename to src/cocoa/src/toga_cocoa/widgets/divider.py diff --git a/src/cocoa/toga_cocoa/widgets/imageview.py b/src/cocoa/src/toga_cocoa/widgets/imageview.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/imageview.py rename to src/cocoa/src/toga_cocoa/widgets/imageview.py diff --git a/src/cocoa/toga_cocoa/widgets/internal/__init__.py b/src/cocoa/src/toga_cocoa/widgets/internal/__init__.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/internal/__init__.py rename to src/cocoa/src/toga_cocoa/widgets/internal/__init__.py diff --git a/src/cocoa/toga_cocoa/widgets/internal/cells.py b/src/cocoa/src/toga_cocoa/widgets/internal/cells.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/internal/cells.py rename to src/cocoa/src/toga_cocoa/widgets/internal/cells.py diff --git a/src/cocoa/toga_cocoa/widgets/internal/data.py b/src/cocoa/src/toga_cocoa/widgets/internal/data.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/internal/data.py rename to src/cocoa/src/toga_cocoa/widgets/internal/data.py diff --git a/src/cocoa/toga_cocoa/widgets/internal/refresh.py b/src/cocoa/src/toga_cocoa/widgets/internal/refresh.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/internal/refresh.py rename to src/cocoa/src/toga_cocoa/widgets/internal/refresh.py diff --git a/src/cocoa/toga_cocoa/widgets/label.py b/src/cocoa/src/toga_cocoa/widgets/label.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/label.py rename to src/cocoa/src/toga_cocoa/widgets/label.py diff --git a/src/cocoa/toga_cocoa/widgets/multilinetextinput.py b/src/cocoa/src/toga_cocoa/widgets/multilinetextinput.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/multilinetextinput.py rename to src/cocoa/src/toga_cocoa/widgets/multilinetextinput.py diff --git a/src/cocoa/toga_cocoa/widgets/numberinput.py b/src/cocoa/src/toga_cocoa/widgets/numberinput.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/numberinput.py rename to src/cocoa/src/toga_cocoa/widgets/numberinput.py diff --git a/src/cocoa/toga_cocoa/widgets/optioncontainer.py b/src/cocoa/src/toga_cocoa/widgets/optioncontainer.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/optioncontainer.py rename to src/cocoa/src/toga_cocoa/widgets/optioncontainer.py diff --git a/src/cocoa/toga_cocoa/widgets/passwordinput.py b/src/cocoa/src/toga_cocoa/widgets/passwordinput.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/passwordinput.py rename to src/cocoa/src/toga_cocoa/widgets/passwordinput.py diff --git a/src/cocoa/toga_cocoa/widgets/progressbar.py b/src/cocoa/src/toga_cocoa/widgets/progressbar.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/progressbar.py rename to src/cocoa/src/toga_cocoa/widgets/progressbar.py diff --git a/src/cocoa/toga_cocoa/widgets/scrollcontainer.py b/src/cocoa/src/toga_cocoa/widgets/scrollcontainer.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/scrollcontainer.py rename to src/cocoa/src/toga_cocoa/widgets/scrollcontainer.py diff --git a/src/cocoa/toga_cocoa/widgets/selection.py b/src/cocoa/src/toga_cocoa/widgets/selection.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/selection.py rename to src/cocoa/src/toga_cocoa/widgets/selection.py diff --git a/src/cocoa/toga_cocoa/widgets/slider.py b/src/cocoa/src/toga_cocoa/widgets/slider.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/slider.py rename to src/cocoa/src/toga_cocoa/widgets/slider.py diff --git a/src/cocoa/toga_cocoa/widgets/splitcontainer.py b/src/cocoa/src/toga_cocoa/widgets/splitcontainer.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/splitcontainer.py rename to src/cocoa/src/toga_cocoa/widgets/splitcontainer.py diff --git a/src/cocoa/toga_cocoa/widgets/switch.py b/src/cocoa/src/toga_cocoa/widgets/switch.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/switch.py rename to src/cocoa/src/toga_cocoa/widgets/switch.py diff --git a/src/cocoa/toga_cocoa/widgets/table.py b/src/cocoa/src/toga_cocoa/widgets/table.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/table.py rename to src/cocoa/src/toga_cocoa/widgets/table.py diff --git a/src/cocoa/toga_cocoa/widgets/textinput.py b/src/cocoa/src/toga_cocoa/widgets/textinput.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/textinput.py rename to src/cocoa/src/toga_cocoa/widgets/textinput.py diff --git a/src/cocoa/toga_cocoa/widgets/tree.py b/src/cocoa/src/toga_cocoa/widgets/tree.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/tree.py rename to src/cocoa/src/toga_cocoa/widgets/tree.py diff --git a/src/cocoa/toga_cocoa/widgets/webview.py b/src/cocoa/src/toga_cocoa/widgets/webview.py similarity index 100% rename from src/cocoa/toga_cocoa/widgets/webview.py rename to src/cocoa/src/toga_cocoa/widgets/webview.py diff --git a/src/cocoa/toga_cocoa/window.py b/src/cocoa/src/toga_cocoa/window.py similarity index 100% rename from src/cocoa/toga_cocoa/window.py rename to src/cocoa/src/toga_cocoa/window.py diff --git a/src/gtk/MANIFEST.in b/src/gtk/MANIFEST.in index 2adcd07a63..87588f6f9a 100644 --- a/src/gtk/MANIFEST.in +++ b/src/gtk/MANIFEST.in @@ -1,5 +1,4 @@ include CONTRIBUTING.md include LICENSE include README.rst -recursive-include toga_gtk *.py recursive-include tests *.py \ No newline at end of file diff --git a/src/gtk/setup.cfg b/src/gtk/setup.cfg index b06236abc0..848dad4e68 100644 --- a/src/gtk/setup.cfg +++ b/src/gtk/setup.cfg @@ -39,15 +39,11 @@ keywords = gtk [options] -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False -[options.packages.find] -include = - toga_gtk - toga_gtk.* - [flake8] exclude=\ .eggs/*,\ diff --git a/src/gtk/setup.py b/src/gtk/setup.py index 90011e9fcf..601f5ebf49 100644 --- a/src/gtk/setup.py +++ b/src/gtk/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga_gtk to compute the version; # and to support versioned subpackage dependencies -with open('toga_gtk/__init__.py', encoding='utf8') as version_file: +with open('src/toga_gtk/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/gtk/toga_gtk/__init__.py b/src/gtk/src/toga_gtk/__init__.py similarity index 100% rename from src/gtk/toga_gtk/__init__.py rename to src/gtk/src/toga_gtk/__init__.py diff --git a/src/gtk/toga_gtk/app.py b/src/gtk/src/toga_gtk/app.py similarity index 100% rename from src/gtk/toga_gtk/app.py rename to src/gtk/src/toga_gtk/app.py diff --git a/src/gtk/toga_gtk/colors.py b/src/gtk/src/toga_gtk/colors.py similarity index 100% rename from src/gtk/toga_gtk/colors.py rename to src/gtk/src/toga_gtk/colors.py diff --git a/src/gtk/toga_gtk/command.py b/src/gtk/src/toga_gtk/command.py similarity index 100% rename from src/gtk/toga_gtk/command.py rename to src/gtk/src/toga_gtk/command.py diff --git a/src/gtk/toga_gtk/dialogs.py b/src/gtk/src/toga_gtk/dialogs.py similarity index 100% rename from src/gtk/toga_gtk/dialogs.py rename to src/gtk/src/toga_gtk/dialogs.py diff --git a/src/gtk/toga_gtk/documents.py b/src/gtk/src/toga_gtk/documents.py similarity index 100% rename from src/gtk/toga_gtk/documents.py rename to src/gtk/src/toga_gtk/documents.py diff --git a/src/gtk/toga_gtk/factory.py b/src/gtk/src/toga_gtk/factory.py similarity index 100% rename from src/gtk/toga_gtk/factory.py rename to src/gtk/src/toga_gtk/factory.py diff --git a/src/gtk/toga_gtk/fonts.py b/src/gtk/src/toga_gtk/fonts.py similarity index 100% rename from src/gtk/toga_gtk/fonts.py rename to src/gtk/src/toga_gtk/fonts.py diff --git a/src/gtk/toga_gtk/hardware/__init__.py b/src/gtk/src/toga_gtk/hardware/__init__.py similarity index 100% rename from src/gtk/toga_gtk/hardware/__init__.py rename to src/gtk/src/toga_gtk/hardware/__init__.py diff --git a/src/gtk/toga_gtk/icons.py b/src/gtk/src/toga_gtk/icons.py similarity index 100% rename from src/gtk/toga_gtk/icons.py rename to src/gtk/src/toga_gtk/icons.py diff --git a/src/gtk/toga_gtk/images.py b/src/gtk/src/toga_gtk/images.py similarity index 100% rename from src/gtk/toga_gtk/images.py rename to src/gtk/src/toga_gtk/images.py diff --git a/src/gtk/toga_gtk/keys.py b/src/gtk/src/toga_gtk/keys.py similarity index 100% rename from src/gtk/toga_gtk/keys.py rename to src/gtk/src/toga_gtk/keys.py diff --git a/src/gtk/toga_gtk/libs/__init__.py b/src/gtk/src/toga_gtk/libs/__init__.py similarity index 100% rename from src/gtk/toga_gtk/libs/__init__.py rename to src/gtk/src/toga_gtk/libs/__init__.py diff --git a/src/gtk/toga_gtk/libs/gtk.py b/src/gtk/src/toga_gtk/libs/gtk.py similarity index 100% rename from src/gtk/toga_gtk/libs/gtk.py rename to src/gtk/src/toga_gtk/libs/gtk.py diff --git a/src/gtk/toga_gtk/libs/styles.py b/src/gtk/src/toga_gtk/libs/styles.py similarity index 100% rename from src/gtk/toga_gtk/libs/styles.py rename to src/gtk/src/toga_gtk/libs/styles.py diff --git a/src/gtk/toga_gtk/libs/utils.py b/src/gtk/src/toga_gtk/libs/utils.py similarity index 100% rename from src/gtk/toga_gtk/libs/utils.py rename to src/gtk/src/toga_gtk/libs/utils.py diff --git a/src/gtk/toga_gtk/paths.py b/src/gtk/src/toga_gtk/paths.py similarity index 100% rename from src/gtk/toga_gtk/paths.py rename to src/gtk/src/toga_gtk/paths.py diff --git a/src/gtk/toga_gtk/widgets/__init__.py b/src/gtk/src/toga_gtk/widgets/__init__.py similarity index 100% rename from src/gtk/toga_gtk/widgets/__init__.py rename to src/gtk/src/toga_gtk/widgets/__init__.py diff --git a/src/gtk/toga_gtk/widgets/activityindicator.py b/src/gtk/src/toga_gtk/widgets/activityindicator.py similarity index 100% rename from src/gtk/toga_gtk/widgets/activityindicator.py rename to src/gtk/src/toga_gtk/widgets/activityindicator.py diff --git a/src/gtk/toga_gtk/widgets/base.py b/src/gtk/src/toga_gtk/widgets/base.py similarity index 100% rename from src/gtk/toga_gtk/widgets/base.py rename to src/gtk/src/toga_gtk/widgets/base.py diff --git a/src/gtk/toga_gtk/widgets/box.py b/src/gtk/src/toga_gtk/widgets/box.py similarity index 100% rename from src/gtk/toga_gtk/widgets/box.py rename to src/gtk/src/toga_gtk/widgets/box.py diff --git a/src/gtk/toga_gtk/widgets/button.py b/src/gtk/src/toga_gtk/widgets/button.py similarity index 100% rename from src/gtk/toga_gtk/widgets/button.py rename to src/gtk/src/toga_gtk/widgets/button.py diff --git a/src/gtk/toga_gtk/widgets/canvas.py b/src/gtk/src/toga_gtk/widgets/canvas.py similarity index 100% rename from src/gtk/toga_gtk/widgets/canvas.py rename to src/gtk/src/toga_gtk/widgets/canvas.py diff --git a/src/gtk/toga_gtk/widgets/detailedlist.py b/src/gtk/src/toga_gtk/widgets/detailedlist.py similarity index 100% rename from src/gtk/toga_gtk/widgets/detailedlist.py rename to src/gtk/src/toga_gtk/widgets/detailedlist.py diff --git a/src/gtk/toga_gtk/widgets/divider.py b/src/gtk/src/toga_gtk/widgets/divider.py similarity index 100% rename from src/gtk/toga_gtk/widgets/divider.py rename to src/gtk/src/toga_gtk/widgets/divider.py diff --git a/src/gtk/toga_gtk/widgets/imageview.py b/src/gtk/src/toga_gtk/widgets/imageview.py similarity index 100% rename from src/gtk/toga_gtk/widgets/imageview.py rename to src/gtk/src/toga_gtk/widgets/imageview.py diff --git a/src/gtk/toga_gtk/widgets/internal/__init__.py b/src/gtk/src/toga_gtk/widgets/internal/__init__.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/__init__.py rename to src/gtk/src/toga_gtk/widgets/internal/__init__.py diff --git a/src/gtk/toga_gtk/widgets/internal/buttons/__init__.py b/src/gtk/src/toga_gtk/widgets/internal/buttons/__init__.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/buttons/__init__.py rename to src/gtk/src/toga_gtk/widgets/internal/buttons/__init__.py diff --git a/src/gtk/toga_gtk/widgets/internal/buttons/base.py b/src/gtk/src/toga_gtk/widgets/internal/buttons/base.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/buttons/base.py rename to src/gtk/src/toga_gtk/widgets/internal/buttons/base.py diff --git a/src/gtk/toga_gtk/widgets/internal/buttons/refresh.py b/src/gtk/src/toga_gtk/widgets/internal/buttons/refresh.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/buttons/refresh.py rename to src/gtk/src/toga_gtk/widgets/internal/buttons/refresh.py diff --git a/src/gtk/toga_gtk/widgets/internal/buttons/scroll.py b/src/gtk/src/toga_gtk/widgets/internal/buttons/scroll.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/buttons/scroll.py rename to src/gtk/src/toga_gtk/widgets/internal/buttons/scroll.py diff --git a/src/gtk/toga_gtk/widgets/internal/rows/__init__.py b/src/gtk/src/toga_gtk/widgets/internal/rows/__init__.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/rows/__init__.py rename to src/gtk/src/toga_gtk/widgets/internal/rows/__init__.py diff --git a/src/gtk/toga_gtk/widgets/internal/rows/base.py b/src/gtk/src/toga_gtk/widgets/internal/rows/base.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/rows/base.py rename to src/gtk/src/toga_gtk/widgets/internal/rows/base.py diff --git a/src/gtk/toga_gtk/widgets/internal/rows/scrollable.py b/src/gtk/src/toga_gtk/widgets/internal/rows/scrollable.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/rows/scrollable.py rename to src/gtk/src/toga_gtk/widgets/internal/rows/scrollable.py diff --git a/src/gtk/toga_gtk/widgets/internal/rows/texticon.py b/src/gtk/src/toga_gtk/widgets/internal/rows/texticon.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/rows/texticon.py rename to src/gtk/src/toga_gtk/widgets/internal/rows/texticon.py diff --git a/src/gtk/toga_gtk/widgets/internal/sourcetreemodel.py b/src/gtk/src/toga_gtk/widgets/internal/sourcetreemodel.py similarity index 100% rename from src/gtk/toga_gtk/widgets/internal/sourcetreemodel.py rename to src/gtk/src/toga_gtk/widgets/internal/sourcetreemodel.py diff --git a/src/gtk/toga_gtk/widgets/label.py b/src/gtk/src/toga_gtk/widgets/label.py similarity index 100% rename from src/gtk/toga_gtk/widgets/label.py rename to src/gtk/src/toga_gtk/widgets/label.py diff --git a/src/gtk/toga_gtk/widgets/multilinetextinput.py b/src/gtk/src/toga_gtk/widgets/multilinetextinput.py similarity index 100% rename from src/gtk/toga_gtk/widgets/multilinetextinput.py rename to src/gtk/src/toga_gtk/widgets/multilinetextinput.py diff --git a/src/gtk/toga_gtk/widgets/numberinput.py b/src/gtk/src/toga_gtk/widgets/numberinput.py similarity index 100% rename from src/gtk/toga_gtk/widgets/numberinput.py rename to src/gtk/src/toga_gtk/widgets/numberinput.py diff --git a/src/gtk/toga_gtk/widgets/optioncontainer.py b/src/gtk/src/toga_gtk/widgets/optioncontainer.py similarity index 100% rename from src/gtk/toga_gtk/widgets/optioncontainer.py rename to src/gtk/src/toga_gtk/widgets/optioncontainer.py diff --git a/src/gtk/toga_gtk/widgets/passwordinput.py b/src/gtk/src/toga_gtk/widgets/passwordinput.py similarity index 100% rename from src/gtk/toga_gtk/widgets/passwordinput.py rename to src/gtk/src/toga_gtk/widgets/passwordinput.py diff --git a/src/gtk/toga_gtk/widgets/progressbar.py b/src/gtk/src/toga_gtk/widgets/progressbar.py similarity index 100% rename from src/gtk/toga_gtk/widgets/progressbar.py rename to src/gtk/src/toga_gtk/widgets/progressbar.py diff --git a/src/gtk/toga_gtk/widgets/scrollcontainer.py b/src/gtk/src/toga_gtk/widgets/scrollcontainer.py similarity index 100% rename from src/gtk/toga_gtk/widgets/scrollcontainer.py rename to src/gtk/src/toga_gtk/widgets/scrollcontainer.py diff --git a/src/gtk/toga_gtk/widgets/selection.py b/src/gtk/src/toga_gtk/widgets/selection.py similarity index 100% rename from src/gtk/toga_gtk/widgets/selection.py rename to src/gtk/src/toga_gtk/widgets/selection.py diff --git a/src/gtk/toga_gtk/widgets/slider.py b/src/gtk/src/toga_gtk/widgets/slider.py similarity index 100% rename from src/gtk/toga_gtk/widgets/slider.py rename to src/gtk/src/toga_gtk/widgets/slider.py diff --git a/src/gtk/toga_gtk/widgets/splitcontainer.py b/src/gtk/src/toga_gtk/widgets/splitcontainer.py similarity index 100% rename from src/gtk/toga_gtk/widgets/splitcontainer.py rename to src/gtk/src/toga_gtk/widgets/splitcontainer.py diff --git a/src/gtk/toga_gtk/widgets/switch.py b/src/gtk/src/toga_gtk/widgets/switch.py similarity index 100% rename from src/gtk/toga_gtk/widgets/switch.py rename to src/gtk/src/toga_gtk/widgets/switch.py diff --git a/src/gtk/toga_gtk/widgets/table.py b/src/gtk/src/toga_gtk/widgets/table.py similarity index 100% rename from src/gtk/toga_gtk/widgets/table.py rename to src/gtk/src/toga_gtk/widgets/table.py diff --git a/src/gtk/toga_gtk/widgets/textinput.py b/src/gtk/src/toga_gtk/widgets/textinput.py similarity index 100% rename from src/gtk/toga_gtk/widgets/textinput.py rename to src/gtk/src/toga_gtk/widgets/textinput.py diff --git a/src/gtk/toga_gtk/widgets/tree.py b/src/gtk/src/toga_gtk/widgets/tree.py similarity index 100% rename from src/gtk/toga_gtk/widgets/tree.py rename to src/gtk/src/toga_gtk/widgets/tree.py diff --git a/src/gtk/toga_gtk/widgets/webview.py b/src/gtk/src/toga_gtk/widgets/webview.py similarity index 100% rename from src/gtk/toga_gtk/widgets/webview.py rename to src/gtk/src/toga_gtk/widgets/webview.py diff --git a/src/gtk/toga_gtk/window.py b/src/gtk/src/toga_gtk/window.py similarity index 100% rename from src/gtk/toga_gtk/window.py rename to src/gtk/src/toga_gtk/window.py diff --git a/src/iOS/MANIFEST.in b/src/iOS/MANIFEST.in index 70a728ca64..ecd14299d5 100644 --- a/src/iOS/MANIFEST.in +++ b/src/iOS/MANIFEST.in @@ -2,4 +2,3 @@ include CONTRIBUTING.md include LICENSE include README.rst recursive-include tests *.py -recursive-include toga_iOS *.py diff --git a/src/iOS/setup.cfg b/src/iOS/setup.cfg index ceba4b29e7..283207d85a 100644 --- a/src/iOS/setup.cfg +++ b/src/iOS/setup.cfg @@ -38,15 +38,11 @@ keywords = iOS [options] -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False -[options.packages.find] -include = - toga_iOS - toga_iOS.* - [flake8] exclude=\ .eggs/*,\ diff --git a/src/iOS/setup.py b/src/iOS/setup.py index ac1922378d..73b4ae9d56 100644 --- a/src/iOS/setup.py +++ b/src/iOS/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga_iOS to compute the version; # and to support versioned subpackage dependencies -with open('toga_iOS/__init__.py', encoding='utf8') as version_file: +with open('src/toga_iOS/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/iOS/toga_iOS/__init__.py b/src/iOS/src/toga_iOS/__init__.py similarity index 100% rename from src/iOS/toga_iOS/__init__.py rename to src/iOS/src/toga_iOS/__init__.py diff --git a/src/iOS/toga_iOS/app.py b/src/iOS/src/toga_iOS/app.py similarity index 100% rename from src/iOS/toga_iOS/app.py rename to src/iOS/src/toga_iOS/app.py diff --git a/src/iOS/toga_iOS/colors.py b/src/iOS/src/toga_iOS/colors.py similarity index 100% rename from src/iOS/toga_iOS/colors.py rename to src/iOS/src/toga_iOS/colors.py diff --git a/src/iOS/toga_iOS/constraints.py b/src/iOS/src/toga_iOS/constraints.py similarity index 100% rename from src/iOS/toga_iOS/constraints.py rename to src/iOS/src/toga_iOS/constraints.py diff --git a/src/iOS/toga_iOS/dialogs.py b/src/iOS/src/toga_iOS/dialogs.py similarity index 100% rename from src/iOS/toga_iOS/dialogs.py rename to src/iOS/src/toga_iOS/dialogs.py diff --git a/src/iOS/toga_iOS/factory.py b/src/iOS/src/toga_iOS/factory.py similarity index 100% rename from src/iOS/toga_iOS/factory.py rename to src/iOS/src/toga_iOS/factory.py diff --git a/src/iOS/toga_iOS/fonts.py b/src/iOS/src/toga_iOS/fonts.py similarity index 100% rename from src/iOS/toga_iOS/fonts.py rename to src/iOS/src/toga_iOS/fonts.py diff --git a/src/iOS/toga_iOS/hardware/__init__.py b/src/iOS/src/toga_iOS/hardware/__init__.py similarity index 100% rename from src/iOS/toga_iOS/hardware/__init__.py rename to src/iOS/src/toga_iOS/hardware/__init__.py diff --git a/src/iOS/toga_iOS/icons.py b/src/iOS/src/toga_iOS/icons.py similarity index 100% rename from src/iOS/toga_iOS/icons.py rename to src/iOS/src/toga_iOS/icons.py diff --git a/src/iOS/toga_iOS/images.py b/src/iOS/src/toga_iOS/images.py similarity index 100% rename from src/iOS/toga_iOS/images.py rename to src/iOS/src/toga_iOS/images.py diff --git a/src/iOS/toga_iOS/libs/__init__.py b/src/iOS/src/toga_iOS/libs/__init__.py similarity index 100% rename from src/iOS/toga_iOS/libs/__init__.py rename to src/iOS/src/toga_iOS/libs/__init__.py diff --git a/src/iOS/toga_iOS/libs/core_graphics.py b/src/iOS/src/toga_iOS/libs/core_graphics.py similarity index 100% rename from src/iOS/toga_iOS/libs/core_graphics.py rename to src/iOS/src/toga_iOS/libs/core_graphics.py diff --git a/src/iOS/toga_iOS/libs/foundation.py b/src/iOS/src/toga_iOS/libs/foundation.py similarity index 100% rename from src/iOS/toga_iOS/libs/foundation.py rename to src/iOS/src/toga_iOS/libs/foundation.py diff --git a/src/iOS/toga_iOS/libs/uikit.py b/src/iOS/src/toga_iOS/libs/uikit.py similarity index 100% rename from src/iOS/toga_iOS/libs/uikit.py rename to src/iOS/src/toga_iOS/libs/uikit.py diff --git a/src/iOS/toga_iOS/libs/webkit.py b/src/iOS/src/toga_iOS/libs/webkit.py similarity index 100% rename from src/iOS/toga_iOS/libs/webkit.py rename to src/iOS/src/toga_iOS/libs/webkit.py diff --git a/src/iOS/toga_iOS/paths.py b/src/iOS/src/toga_iOS/paths.py similarity index 100% rename from src/iOS/toga_iOS/paths.py rename to src/iOS/src/toga_iOS/paths.py diff --git a/src/iOS/toga_iOS/widgets/__init__.py b/src/iOS/src/toga_iOS/widgets/__init__.py similarity index 100% rename from src/iOS/toga_iOS/widgets/__init__.py rename to src/iOS/src/toga_iOS/widgets/__init__.py diff --git a/src/iOS/toga_iOS/widgets/base.py b/src/iOS/src/toga_iOS/widgets/base.py similarity index 100% rename from src/iOS/toga_iOS/widgets/base.py rename to src/iOS/src/toga_iOS/widgets/base.py diff --git a/src/iOS/toga_iOS/widgets/box.py b/src/iOS/src/toga_iOS/widgets/box.py similarity index 100% rename from src/iOS/toga_iOS/widgets/box.py rename to src/iOS/src/toga_iOS/widgets/box.py diff --git a/src/iOS/toga_iOS/widgets/button.py b/src/iOS/src/toga_iOS/widgets/button.py similarity index 100% rename from src/iOS/toga_iOS/widgets/button.py rename to src/iOS/src/toga_iOS/widgets/button.py diff --git a/src/iOS/toga_iOS/widgets/canvas.py b/src/iOS/src/toga_iOS/widgets/canvas.py similarity index 100% rename from src/iOS/toga_iOS/widgets/canvas.py rename to src/iOS/src/toga_iOS/widgets/canvas.py diff --git a/src/iOS/toga_iOS/widgets/detailedlist.py b/src/iOS/src/toga_iOS/widgets/detailedlist.py similarity index 100% rename from src/iOS/toga_iOS/widgets/detailedlist.py rename to src/iOS/src/toga_iOS/widgets/detailedlist.py diff --git a/src/iOS/toga_iOS/widgets/imageview.py b/src/iOS/src/toga_iOS/widgets/imageview.py similarity index 100% rename from src/iOS/toga_iOS/widgets/imageview.py rename to src/iOS/src/toga_iOS/widgets/imageview.py diff --git a/src/iOS/toga_iOS/widgets/label.py b/src/iOS/src/toga_iOS/widgets/label.py similarity index 100% rename from src/iOS/toga_iOS/widgets/label.py rename to src/iOS/src/toga_iOS/widgets/label.py diff --git a/src/iOS/toga_iOS/widgets/multilinetextinput.py b/src/iOS/src/toga_iOS/widgets/multilinetextinput.py similarity index 100% rename from src/iOS/toga_iOS/widgets/multilinetextinput.py rename to src/iOS/src/toga_iOS/widgets/multilinetextinput.py diff --git a/src/iOS/toga_iOS/widgets/navigationview.py b/src/iOS/src/toga_iOS/widgets/navigationview.py similarity index 100% rename from src/iOS/toga_iOS/widgets/navigationview.py rename to src/iOS/src/toga_iOS/widgets/navigationview.py diff --git a/src/iOS/toga_iOS/widgets/numberinput.py b/src/iOS/src/toga_iOS/widgets/numberinput.py similarity index 100% rename from src/iOS/toga_iOS/widgets/numberinput.py rename to src/iOS/src/toga_iOS/widgets/numberinput.py diff --git a/src/iOS/toga_iOS/widgets/passwordinput.py b/src/iOS/src/toga_iOS/widgets/passwordinput.py similarity index 100% rename from src/iOS/toga_iOS/widgets/passwordinput.py rename to src/iOS/src/toga_iOS/widgets/passwordinput.py diff --git a/src/iOS/toga_iOS/widgets/progressbar.py b/src/iOS/src/toga_iOS/widgets/progressbar.py similarity index 100% rename from src/iOS/toga_iOS/widgets/progressbar.py rename to src/iOS/src/toga_iOS/widgets/progressbar.py diff --git a/src/iOS/toga_iOS/widgets/scrollcontainer.py b/src/iOS/src/toga_iOS/widgets/scrollcontainer.py similarity index 100% rename from src/iOS/toga_iOS/widgets/scrollcontainer.py rename to src/iOS/src/toga_iOS/widgets/scrollcontainer.py diff --git a/src/iOS/toga_iOS/widgets/selection.py b/src/iOS/src/toga_iOS/widgets/selection.py similarity index 100% rename from src/iOS/toga_iOS/widgets/selection.py rename to src/iOS/src/toga_iOS/widgets/selection.py diff --git a/src/iOS/toga_iOS/widgets/slider.py b/src/iOS/src/toga_iOS/widgets/slider.py similarity index 100% rename from src/iOS/toga_iOS/widgets/slider.py rename to src/iOS/src/toga_iOS/widgets/slider.py diff --git a/src/iOS/toga_iOS/widgets/switch.py b/src/iOS/src/toga_iOS/widgets/switch.py similarity index 100% rename from src/iOS/toga_iOS/widgets/switch.py rename to src/iOS/src/toga_iOS/widgets/switch.py diff --git a/src/iOS/toga_iOS/widgets/textinput.py b/src/iOS/src/toga_iOS/widgets/textinput.py similarity index 100% rename from src/iOS/toga_iOS/widgets/textinput.py rename to src/iOS/src/toga_iOS/widgets/textinput.py diff --git a/src/iOS/toga_iOS/widgets/webview.py b/src/iOS/src/toga_iOS/widgets/webview.py similarity index 100% rename from src/iOS/toga_iOS/widgets/webview.py rename to src/iOS/src/toga_iOS/widgets/webview.py diff --git a/src/iOS/toga_iOS/window.py b/src/iOS/src/toga_iOS/window.py similarity index 100% rename from src/iOS/toga_iOS/window.py rename to src/iOS/src/toga_iOS/window.py diff --git a/src/web/MANIFEST.in b/src/web/MANIFEST.in index 744d92c395..ecd14299d5 100644 --- a/src/web/MANIFEST.in +++ b/src/web/MANIFEST.in @@ -2,5 +2,3 @@ include CONTRIBUTING.md include LICENSE include README.rst recursive-include tests *.py -recursive-include toga_web *.py -recursive-include toga_web/static *.css \ No newline at end of file diff --git a/src/web/setup.cfg b/src/web/setup.cfg index ed72fe0df4..3e600c5517 100644 --- a/src/web/setup.cfg +++ b/src/web/setup.cfg @@ -37,19 +37,14 @@ keywords = web [options] -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False -include_package_data = True [options.package_data] toga_web = - toga_web/static/toga.css - -[options.packages.find] -include = - toga_web - toga_web.* + static/** [flake8] exclude=\ diff --git a/src/web/setup.py b/src/web/setup.py index a567556342..83ff099f73 100644 --- a/src/web/setup.py +++ b/src/web/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga_web to compute the version; # and to support versioned subpackage dependencies -with open('toga_web/__init__.py', encoding='utf8') as version_file: +with open('src/toga_web/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/web/toga_web/__init__.py b/src/web/src/toga_web/__init__.py similarity index 100% rename from src/web/toga_web/__init__.py rename to src/web/src/toga_web/__init__.py diff --git a/src/web/toga_web/app.py b/src/web/src/toga_web/app.py similarity index 100% rename from src/web/toga_web/app.py rename to src/web/src/toga_web/app.py diff --git a/src/web/toga_web/command.py b/src/web/src/toga_web/command.py similarity index 100% rename from src/web/toga_web/command.py rename to src/web/src/toga_web/command.py diff --git a/src/web/toga_web/dialogs.py b/src/web/src/toga_web/dialogs.py similarity index 100% rename from src/web/toga_web/dialogs.py rename to src/web/src/toga_web/dialogs.py diff --git a/src/web/toga_web/factory.py b/src/web/src/toga_web/factory.py similarity index 100% rename from src/web/toga_web/factory.py rename to src/web/src/toga_web/factory.py diff --git a/src/web/toga_web/icons.py b/src/web/src/toga_web/icons.py similarity index 100% rename from src/web/toga_web/icons.py rename to src/web/src/toga_web/icons.py diff --git a/src/web/toga_web/libs.py b/src/web/src/toga_web/libs.py similarity index 100% rename from src/web/toga_web/libs.py rename to src/web/src/toga_web/libs.py diff --git a/src/web/toga_web/paths.py b/src/web/src/toga_web/paths.py similarity index 100% rename from src/web/toga_web/paths.py rename to src/web/src/toga_web/paths.py diff --git a/src/web/toga_web/static/toga.css b/src/web/src/toga_web/static/toga.css similarity index 100% rename from src/web/toga_web/static/toga.css rename to src/web/src/toga_web/static/toga.css diff --git a/src/web/toga_web/widgets/__init__.py b/src/web/src/toga_web/widgets/__init__.py similarity index 100% rename from src/web/toga_web/widgets/__init__.py rename to src/web/src/toga_web/widgets/__init__.py diff --git a/src/web/toga_web/widgets/base.py b/src/web/src/toga_web/widgets/base.py similarity index 100% rename from src/web/toga_web/widgets/base.py rename to src/web/src/toga_web/widgets/base.py diff --git a/src/web/toga_web/widgets/box.py b/src/web/src/toga_web/widgets/box.py similarity index 100% rename from src/web/toga_web/widgets/box.py rename to src/web/src/toga_web/widgets/box.py diff --git a/src/web/toga_web/widgets/button.py b/src/web/src/toga_web/widgets/button.py similarity index 100% rename from src/web/toga_web/widgets/button.py rename to src/web/src/toga_web/widgets/button.py diff --git a/src/web/toga_web/widgets/label.py b/src/web/src/toga_web/widgets/label.py similarity index 100% rename from src/web/toga_web/widgets/label.py rename to src/web/src/toga_web/widgets/label.py diff --git a/src/web/toga_web/widgets/textinput.py b/src/web/src/toga_web/widgets/textinput.py similarity index 100% rename from src/web/toga_web/widgets/textinput.py rename to src/web/src/toga_web/widgets/textinput.py diff --git a/src/web/toga_web/window.py b/src/web/src/toga_web/window.py similarity index 100% rename from src/web/toga_web/window.py rename to src/web/src/toga_web/window.py diff --git a/src/winforms/MANIFEST.in b/src/winforms/MANIFEST.in index 145cd1e92f..ecd14299d5 100644 --- a/src/winforms/MANIFEST.in +++ b/src/winforms/MANIFEST.in @@ -1,8 +1,4 @@ include CONTRIBUTING.md include LICENSE include README.rst -include toga_winforms/libs/WebView2/LICENSE.md -include toga_winforms/libs/WebView2/README.md -recursive-include toga_winforms *.py recursive-include tests *.py -recursive-include toga_winforms/libs/WebView2 *.dll diff --git a/src/winforms/setup.cfg b/src/winforms/setup.cfg index d4737626d7..5a2eeb3a60 100644 --- a/src/winforms/setup.cfg +++ b/src/winforms/setup.cfg @@ -39,24 +39,14 @@ keywords = winforms [options] -packages = find: +package_dir = + = src python_requires = >= 3.6 zip_safe = False -include_package_data = True [options.package_data] toga_winforms = - toga_winforms/libs/WebView2/LICENSE.md - toga_winforms/libs/WebView2/Microsoft.Web.WebView2.Core.dll - toga_winforms/libs/WebView2/Microsoft.Web.WebView2.WinForms.dll - toga_winforms/libs/WebView2/arm64/WebView2Loader.dll - toga_winforms/libs/WebView2/x64/WebView2Loader.dll - toga_winforms/libs/WebView2/x86/WebView2Loader.dll - -[options.packages.find] -include = - toga_winforms - toga_winforms.* + libs/WebView2/** [flake8] exclude=\ diff --git a/src/winforms/setup.py b/src/winforms/setup.py index ea0972d696..e310991ced 100644 --- a/src/winforms/setup.py +++ b/src/winforms/setup.py @@ -6,7 +6,7 @@ # Version handline needs to be programatic because # we can't import toga_winforms to compute the version; # and to support versioned subpackage dependencies -with open('toga_winforms/__init__.py', encoding='utf8') as version_file: +with open('src/toga_winforms/__init__.py', encoding='utf8') as version_file: version_match = re.search( r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), diff --git a/src/winforms/toga_winforms/__init__.py b/src/winforms/src/toga_winforms/__init__.py similarity index 100% rename from src/winforms/toga_winforms/__init__.py rename to src/winforms/src/toga_winforms/__init__.py diff --git a/src/winforms/toga_winforms/app.py b/src/winforms/src/toga_winforms/app.py similarity index 100% rename from src/winforms/toga_winforms/app.py rename to src/winforms/src/toga_winforms/app.py diff --git a/src/winforms/toga_winforms/colors.py b/src/winforms/src/toga_winforms/colors.py similarity index 100% rename from src/winforms/toga_winforms/colors.py rename to src/winforms/src/toga_winforms/colors.py diff --git a/src/winforms/toga_winforms/command.py b/src/winforms/src/toga_winforms/command.py similarity index 100% rename from src/winforms/toga_winforms/command.py rename to src/winforms/src/toga_winforms/command.py diff --git a/src/winforms/toga_winforms/dialogs.py b/src/winforms/src/toga_winforms/dialogs.py similarity index 100% rename from src/winforms/toga_winforms/dialogs.py rename to src/winforms/src/toga_winforms/dialogs.py diff --git a/src/winforms/toga_winforms/factory.py b/src/winforms/src/toga_winforms/factory.py similarity index 100% rename from src/winforms/toga_winforms/factory.py rename to src/winforms/src/toga_winforms/factory.py diff --git a/src/winforms/toga_winforms/fonts.py b/src/winforms/src/toga_winforms/fonts.py similarity index 100% rename from src/winforms/toga_winforms/fonts.py rename to src/winforms/src/toga_winforms/fonts.py diff --git a/src/winforms/toga_winforms/hardware/__init__.py b/src/winforms/src/toga_winforms/hardware/__init__.py similarity index 100% rename from src/winforms/toga_winforms/hardware/__init__.py rename to src/winforms/src/toga_winforms/hardware/__init__.py diff --git a/src/winforms/toga_winforms/icons.py b/src/winforms/src/toga_winforms/icons.py similarity index 100% rename from src/winforms/toga_winforms/icons.py rename to src/winforms/src/toga_winforms/icons.py diff --git a/src/winforms/toga_winforms/images.py b/src/winforms/src/toga_winforms/images.py similarity index 100% rename from src/winforms/toga_winforms/images.py rename to src/winforms/src/toga_winforms/images.py diff --git a/src/winforms/toga_winforms/keys.py b/src/winforms/src/toga_winforms/keys.py similarity index 100% rename from src/winforms/toga_winforms/keys.py rename to src/winforms/src/toga_winforms/keys.py diff --git a/src/winforms/toga_winforms/libs/WebView2/LICENSE.md b/src/winforms/src/toga_winforms/libs/WebView2/LICENSE.md similarity index 100% rename from src/winforms/toga_winforms/libs/WebView2/LICENSE.md rename to src/winforms/src/toga_winforms/libs/WebView2/LICENSE.md diff --git a/src/winforms/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.Core.dll b/src/winforms/src/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.Core.dll similarity index 100% rename from src/winforms/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.Core.dll rename to src/winforms/src/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.Core.dll diff --git a/src/winforms/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.WinForms.dll b/src/winforms/src/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.WinForms.dll similarity index 100% rename from src/winforms/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.WinForms.dll rename to src/winforms/src/toga_winforms/libs/WebView2/Microsoft.Web.WebView2.WinForms.dll diff --git a/src/winforms/toga_winforms/libs/WebView2/README.md b/src/winforms/src/toga_winforms/libs/WebView2/README.md similarity index 100% rename from src/winforms/toga_winforms/libs/WebView2/README.md rename to src/winforms/src/toga_winforms/libs/WebView2/README.md diff --git a/src/winforms/toga_winforms/libs/WebView2/arm64/WebView2Loader.dll b/src/winforms/src/toga_winforms/libs/WebView2/arm64/WebView2Loader.dll similarity index 100% rename from src/winforms/toga_winforms/libs/WebView2/arm64/WebView2Loader.dll rename to src/winforms/src/toga_winforms/libs/WebView2/arm64/WebView2Loader.dll diff --git a/src/winforms/toga_winforms/libs/WebView2/x64/WebView2Loader.dll b/src/winforms/src/toga_winforms/libs/WebView2/x64/WebView2Loader.dll similarity index 100% rename from src/winforms/toga_winforms/libs/WebView2/x64/WebView2Loader.dll rename to src/winforms/src/toga_winforms/libs/WebView2/x64/WebView2Loader.dll diff --git a/src/winforms/toga_winforms/libs/WebView2/x86/WebView2Loader.dll b/src/winforms/src/toga_winforms/libs/WebView2/x86/WebView2Loader.dll similarity index 100% rename from src/winforms/toga_winforms/libs/WebView2/x86/WebView2Loader.dll rename to src/winforms/src/toga_winforms/libs/WebView2/x86/WebView2Loader.dll diff --git a/src/winforms/toga_winforms/libs/__init__.py b/src/winforms/src/toga_winforms/libs/__init__.py similarity index 100% rename from src/winforms/toga_winforms/libs/__init__.py rename to src/winforms/src/toga_winforms/libs/__init__.py diff --git a/src/winforms/toga_winforms/libs/extensions.py b/src/winforms/src/toga_winforms/libs/extensions.py similarity index 100% rename from src/winforms/toga_winforms/libs/extensions.py rename to src/winforms/src/toga_winforms/libs/extensions.py diff --git a/src/winforms/toga_winforms/libs/fonts.py b/src/winforms/src/toga_winforms/libs/fonts.py similarity index 100% rename from src/winforms/toga_winforms/libs/fonts.py rename to src/winforms/src/toga_winforms/libs/fonts.py diff --git a/src/winforms/toga_winforms/libs/proactor.py b/src/winforms/src/toga_winforms/libs/proactor.py similarity index 100% rename from src/winforms/toga_winforms/libs/proactor.py rename to src/winforms/src/toga_winforms/libs/proactor.py diff --git a/src/winforms/toga_winforms/libs/winforms.py b/src/winforms/src/toga_winforms/libs/winforms.py similarity index 100% rename from src/winforms/toga_winforms/libs/winforms.py rename to src/winforms/src/toga_winforms/libs/winforms.py diff --git a/src/winforms/toga_winforms/paths.py b/src/winforms/src/toga_winforms/paths.py similarity index 100% rename from src/winforms/toga_winforms/paths.py rename to src/winforms/src/toga_winforms/paths.py diff --git a/src/winforms/toga_winforms/widgets/__init__.py b/src/winforms/src/toga_winforms/widgets/__init__.py similarity index 100% rename from src/winforms/toga_winforms/widgets/__init__.py rename to src/winforms/src/toga_winforms/widgets/__init__.py diff --git a/src/winforms/toga_winforms/widgets/base.py b/src/winforms/src/toga_winforms/widgets/base.py similarity index 100% rename from src/winforms/toga_winforms/widgets/base.py rename to src/winforms/src/toga_winforms/widgets/base.py diff --git a/src/winforms/toga_winforms/widgets/box.py b/src/winforms/src/toga_winforms/widgets/box.py similarity index 100% rename from src/winforms/toga_winforms/widgets/box.py rename to src/winforms/src/toga_winforms/widgets/box.py diff --git a/src/winforms/toga_winforms/widgets/button.py b/src/winforms/src/toga_winforms/widgets/button.py similarity index 100% rename from src/winforms/toga_winforms/widgets/button.py rename to src/winforms/src/toga_winforms/widgets/button.py diff --git a/src/winforms/toga_winforms/widgets/canvas.py b/src/winforms/src/toga_winforms/widgets/canvas.py similarity index 100% rename from src/winforms/toga_winforms/widgets/canvas.py rename to src/winforms/src/toga_winforms/widgets/canvas.py diff --git a/src/winforms/toga_winforms/widgets/datepicker.py b/src/winforms/src/toga_winforms/widgets/datepicker.py similarity index 100% rename from src/winforms/toga_winforms/widgets/datepicker.py rename to src/winforms/src/toga_winforms/widgets/datepicker.py diff --git a/src/winforms/toga_winforms/widgets/detailedlist.py b/src/winforms/src/toga_winforms/widgets/detailedlist.py similarity index 100% rename from src/winforms/toga_winforms/widgets/detailedlist.py rename to src/winforms/src/toga_winforms/widgets/detailedlist.py diff --git a/src/winforms/toga_winforms/widgets/divider.py b/src/winforms/src/toga_winforms/widgets/divider.py similarity index 100% rename from src/winforms/toga_winforms/widgets/divider.py rename to src/winforms/src/toga_winforms/widgets/divider.py diff --git a/src/winforms/toga_winforms/widgets/imageview.py b/src/winforms/src/toga_winforms/widgets/imageview.py similarity index 100% rename from src/winforms/toga_winforms/widgets/imageview.py rename to src/winforms/src/toga_winforms/widgets/imageview.py diff --git a/src/winforms/toga_winforms/widgets/label.py b/src/winforms/src/toga_winforms/widgets/label.py similarity index 100% rename from src/winforms/toga_winforms/widgets/label.py rename to src/winforms/src/toga_winforms/widgets/label.py diff --git a/src/winforms/toga_winforms/widgets/multilinetextinput.py b/src/winforms/src/toga_winforms/widgets/multilinetextinput.py similarity index 100% rename from src/winforms/toga_winforms/widgets/multilinetextinput.py rename to src/winforms/src/toga_winforms/widgets/multilinetextinput.py diff --git a/src/winforms/toga_winforms/widgets/numberinput.py b/src/winforms/src/toga_winforms/widgets/numberinput.py similarity index 100% rename from src/winforms/toga_winforms/widgets/numberinput.py rename to src/winforms/src/toga_winforms/widgets/numberinput.py diff --git a/src/winforms/toga_winforms/widgets/optioncontainer.py b/src/winforms/src/toga_winforms/widgets/optioncontainer.py similarity index 100% rename from src/winforms/toga_winforms/widgets/optioncontainer.py rename to src/winforms/src/toga_winforms/widgets/optioncontainer.py diff --git a/src/winforms/toga_winforms/widgets/passwordinput.py b/src/winforms/src/toga_winforms/widgets/passwordinput.py similarity index 100% rename from src/winforms/toga_winforms/widgets/passwordinput.py rename to src/winforms/src/toga_winforms/widgets/passwordinput.py diff --git a/src/winforms/toga_winforms/widgets/progressbar.py b/src/winforms/src/toga_winforms/widgets/progressbar.py similarity index 100% rename from src/winforms/toga_winforms/widgets/progressbar.py rename to src/winforms/src/toga_winforms/widgets/progressbar.py diff --git a/src/winforms/toga_winforms/widgets/scrollcontainer.py b/src/winforms/src/toga_winforms/widgets/scrollcontainer.py similarity index 100% rename from src/winforms/toga_winforms/widgets/scrollcontainer.py rename to src/winforms/src/toga_winforms/widgets/scrollcontainer.py diff --git a/src/winforms/toga_winforms/widgets/selection.py b/src/winforms/src/toga_winforms/widgets/selection.py similarity index 100% rename from src/winforms/toga_winforms/widgets/selection.py rename to src/winforms/src/toga_winforms/widgets/selection.py diff --git a/src/winforms/toga_winforms/widgets/slider.py b/src/winforms/src/toga_winforms/widgets/slider.py similarity index 100% rename from src/winforms/toga_winforms/widgets/slider.py rename to src/winforms/src/toga_winforms/widgets/slider.py diff --git a/src/winforms/toga_winforms/widgets/splitcontainer.py b/src/winforms/src/toga_winforms/widgets/splitcontainer.py similarity index 100% rename from src/winforms/toga_winforms/widgets/splitcontainer.py rename to src/winforms/src/toga_winforms/widgets/splitcontainer.py diff --git a/src/winforms/toga_winforms/widgets/switch.py b/src/winforms/src/toga_winforms/widgets/switch.py similarity index 100% rename from src/winforms/toga_winforms/widgets/switch.py rename to src/winforms/src/toga_winforms/widgets/switch.py diff --git a/src/winforms/toga_winforms/widgets/table.py b/src/winforms/src/toga_winforms/widgets/table.py similarity index 100% rename from src/winforms/toga_winforms/widgets/table.py rename to src/winforms/src/toga_winforms/widgets/table.py diff --git a/src/winforms/toga_winforms/widgets/textinput.py b/src/winforms/src/toga_winforms/widgets/textinput.py similarity index 100% rename from src/winforms/toga_winforms/widgets/textinput.py rename to src/winforms/src/toga_winforms/widgets/textinput.py diff --git a/src/winforms/toga_winforms/widgets/timepicker.py b/src/winforms/src/toga_winforms/widgets/timepicker.py similarity index 100% rename from src/winforms/toga_winforms/widgets/timepicker.py rename to src/winforms/src/toga_winforms/widgets/timepicker.py diff --git a/src/winforms/toga_winforms/widgets/tree.py b/src/winforms/src/toga_winforms/widgets/tree.py similarity index 100% rename from src/winforms/toga_winforms/widgets/tree.py rename to src/winforms/src/toga_winforms/widgets/tree.py diff --git a/src/winforms/toga_winforms/widgets/webview.py b/src/winforms/src/toga_winforms/widgets/webview.py similarity index 100% rename from src/winforms/toga_winforms/widgets/webview.py rename to src/winforms/src/toga_winforms/widgets/webview.py diff --git a/src/winforms/toga_winforms/window.py b/src/winforms/src/toga_winforms/window.py similarity index 100% rename from src/winforms/toga_winforms/window.py rename to src/winforms/src/toga_winforms/window.py From b130961d1c372308d68e88583eb50e9880c556c7 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 19:58:43 +0100 Subject: [PATCH 13/19] Update release workflow to use separate tokens per package --- .github/workflows/ci.yml | 31 +++++++++++++++++++++++-------- .github/workflows/release.yml | 26 ++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04201bebed..8d9c015d13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,6 @@ jobs: - flake8 # - towncrier-check - docs - - package steps: - uses: actions/checkout@v1 - uses: actions/setup-python@v3.1.2 @@ -35,15 +34,29 @@ jobs: python -m pip install --upgrade setuptools python -m pip install tox - run: tox -e ${{ matrix.task }} - - if: matrix.task == 'package' - uses: actions/upload-artifact@v3 + + package: + needs: beefore + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-python@v3.1.2 + with: + python-version: ${{ env.min_python_version }} + - run: pip install tox + - run: tox -e package + - name: Collect packages + run: | + mkdir packages + mv {.,demo,src/*}/dist/* packages + - uses: actions/upload-artifact@v3 with: name: packages - path: "**/dist" + path: packages if-no-files-found: error core: - needs: beefore + needs: package strategy: matrix: platform: ['macos', 'ubuntu', 'windows'] @@ -64,9 +77,10 @@ jobs: uses: actions/download-artifact@v3 with: name: packages + path: packages - name: Test env: - TOGA_INSTALL_COMMAND: 'bash -c "pip install src/{core,dummy}/dist/*.whl"' + TOGA_INSTALL_COMMAND: 'bash -c "pip install packages/toga_{core,dummy}*.whl"' run: | tox -e py - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version @@ -78,7 +92,7 @@ jobs: fail_ci_if_error: true backend: - needs: beefore + needs: package strategy: matrix: backend: [android, cocoa, gtk, iOS, web, winforms] @@ -112,13 +126,14 @@ jobs: uses: actions/download-artifact@v3 with: name: packages + path: packages - name: Install dependencies run: | ${{ matrix.pre-command }} python -m pip install --upgrade pip python -m pip install --upgrade setuptools python -m pip install pytest-tldr - python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl + python -m pip install packages/toga_{core,dummy,${{ matrix.backend }}}*.whl - name: Test run: | cd src/${{ matrix.backend }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5ed35abb0a..8adab4f553 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,7 @@ on: jobs: ci: uses: ./.github/workflows/ci.yml + release: name: Create Release needs: ci @@ -22,17 +23,34 @@ jobs: uses: actions/download-artifact@v3 with: name: packages - - name: Collect packages - run: mv {demo,src/*}/dist/* dist + path: packages - name: Create Release uses: ncipollo/release-action@v1.11.1 with: name: ${{ env.VERSION }} draft: true - artifacts: "dist/*" + artifacts: "packages/*" artifactErrorsFailBuild: true + + deploy-test: + needs: release + strategy: + matrix: + package: ["toga", "toga_android", "toga_cocoa", "toga_core", "toga_demo", + "toga_dummy", "toga_gtk", "toga_iOS", "toga_web", "toga_winforms"] + runs-on: ubuntu-latest + steps: + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages + path: packages + - name: Extract ${{ matrix.package }} + run: | + mkdir dist + mv packages/$(echo ${{ matrix.package }} | sed 's/_/?/')* dist - name: Publish release to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: repository_url: https://test.pypi.org/legacy/ - password: ${{ secrets.TEST_PYPI_PASSWORD }} + password: ${{ secrets[format('TEST_PYPI_PASSWORD_{0}', matrix.package)] }} From 70939c1f7d61b6b5d22528e143013b8013dbd8a4 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 21:04:31 +0100 Subject: [PATCH 14/19] Fix package wildcard / Update publish workflow to use separate tokens per package / Disable all tests --- .github/workflows/ci.yml | 165 +++++++++++++++++----------------- .github/workflows/publish.yml | 17 +++- .github/workflows/release.yml | 9 +- 3 files changed, 100 insertions(+), 91 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d9c015d13..81b2bf69d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,86 +55,87 @@ jobs: path: packages if-no-files-found: error - core: - needs: package - strategy: - matrix: - platform: ['macos', 'ubuntu', 'windows'] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] - runs-on: ${{ matrix.platform }}-latest - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3.1.2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install --upgrade tox - - name: Get packages - uses: actions/download-artifact@v3 - with: - name: packages - path: packages - - name: Test - env: - TOGA_INSTALL_COMMAND: 'bash -c "pip install packages/toga_{core,dummy}*.whl"' - run: | - tox -e py - - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version - uses: codecov/codecov-action@v1 - with: - token: ${{ secrets.CODECOV_TOKEN }} - file: ./coverage.xml - flags: unittests - fail_ci_if_error: true + # FIXME + # core: + # needs: package + # strategy: + # matrix: + # platform: ['macos', 'ubuntu', 'windows'] + # python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] + # runs-on: ${{ matrix.platform }}-latest + # steps: + # - uses: actions/checkout@v1 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v3.1.2 + # with: + # python-version: ${{ matrix.python-version }} + # - name: Install dependencies + # run: | + # python -m pip install --upgrade pip + # python -m pip install --upgrade setuptools + # python -m pip install --upgrade tox + # - name: Get packages + # uses: actions/download-artifact@v3 + # with: + # name: packages + # path: packages + # - name: Test + # env: + # TOGA_INSTALL_COMMAND: 'bash -c "pip install packages/toga_{core,dummy}*.whl"' + # run: | + # tox -e py + # - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version + # uses: codecov/codecov-action@v1 + # with: + # token: ${{ secrets.CODECOV_TOKEN }} + # file: ./coverage.xml + # flags: unittests + # fail_ci_if_error: true - backend: - needs: package - strategy: - matrix: - backend: [android, cocoa, gtk, iOS, web, winforms] - include: - - runs-on: ubuntu-latest - - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) - - pre-command: - - test-command: pytest - - backend: cocoa - runs-on: macos-latest - - backend: gtk - pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" - test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" - - 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" - runs-on: ${{ matrix.runs-on }} - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3.1.2 - with: - # Py3.9 is the first Python version for which - # a wheel of pythonnet isn't available on PyPI. - python-version: ${{ matrix.python-version }} - - name: Get packages - uses: actions/download-artifact@v3 - with: - name: packages - path: packages - - name: Install dependencies - run: | - ${{ matrix.pre-command }} - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools - python -m pip install pytest-tldr - python -m pip install packages/toga_{core,dummy,${{ matrix.backend }}}*.whl - - name: Test - run: | - cd src/${{ matrix.backend }} - ${{ matrix.test-command }} + # backend: + # needs: package + # strategy: + # matrix: + # backend: [android, cocoa, gtk, iOS, web, winforms] + # include: + # - runs-on: ubuntu-latest + # - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) + # - pre-command: + # - test-command: pytest + # - backend: cocoa + # runs-on: macos-latest + # - backend: gtk + # pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" + # test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" + # - 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" + # runs-on: ${{ matrix.runs-on }} + # steps: + # - uses: actions/checkout@v1 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v3.1.2 + # with: + # # Py3.9 is the first Python version for which + # # a wheel of pythonnet isn't available on PyPI. + # python-version: ${{ matrix.python-version }} + # - name: Get packages + # uses: actions/download-artifact@v3 + # with: + # name: packages + # path: packages + # - name: Install dependencies + # run: | + # ${{ matrix.pre-command }} + # python -m pip install --upgrade pip + # python -m pip install --upgrade setuptools + # python -m pip install pytest-tldr + # python -m pip install packages/toga_{core,dummy,${{ matrix.backend }}}*.whl + # - name: Test + # run: | + # cd src/${{ matrix.backend }} + # ${{ matrix.test-command }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5afb41e0e6..96b852050f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,15 +6,24 @@ on: jobs: deploy: + strategy: + matrix: + package: ["toga", "toga_android", "toga_cocoa", "toga_core", "toga_demo", + "toga_dummy", "toga_gtk", "toga_iOS", "toga_web", "toga_winforms"] runs-on: ubuntu-latest steps: - - uses: dsaltares/fetch-gh-release-asset@1.0.0 + - name: Get packages + uses: dsaltares/fetch-gh-release-asset@1.0.0 with: version: tags/${{ github.event.release.tag_name }} file: ${{ github.event.repository.name }}.* regex: true - target: dist/ - - name: Publish release to production PyPI + target: packages/ + - name: Extract ${{ matrix.package }} + run: | + mkdir dist + mv packages/$(echo ${{ matrix.package }} | sed 's/_/?/')-[0-9]* dist + - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - password: ${{ secrets.PYPI_PASSWORD }} + password: ${{ secrets[format('PYPI_PASSWORD_{0}', matrix.package)] }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8adab4f553..b6a92cb3a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: uses: ./.github/workflows/ci.yml release: - name: Create Release + name: Create GitHub release needs: ci runs-on: ubuntu-latest permissions: @@ -24,8 +24,7 @@ jobs: with: name: packages path: packages - - name: Create Release - uses: ncipollo/release-action@v1.11.1 + - uses: ncipollo/release-action@v1.11.1 with: name: ${{ env.VERSION }} draft: true @@ -48,8 +47,8 @@ jobs: - name: Extract ${{ matrix.package }} run: | mkdir dist - mv packages/$(echo ${{ matrix.package }} | sed 's/_/?/')* dist - - name: Publish release to Test PyPI + mv packages/$(echo ${{ matrix.package }} | sed 's/_/?/')-[0-9]* dist + - name: Publish to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 with: repository_url: https://test.pypi.org/legacy/ From c9aa939f8b918738345b5e6a5f09a000040c8faa Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 21:12:33 +0100 Subject: [PATCH 15/19] Bumped version number for v0.0.1rc5 release. --- demo/pyproject.toml | 12 ++++++------ demo/setup.cfg | 4 ++-- .../.template/{{ cookiecutter.name }}/pyproject.toml | 2 +- examples/activityindicator/pyproject.toml | 2 +- examples/beeliza/pyproject.toml | 2 +- examples/box/pyproject.toml | 2 +- examples/button/pyproject.toml | 2 +- examples/canvas/pyproject.toml | 2 +- examples/colors/pyproject.toml | 2 +- examples/command/pyproject.toml | 2 +- examples/date_and_time/pyproject.toml | 2 +- examples/detailedlist/pyproject.toml | 2 +- examples/dialogs/pyproject.toml | 2 +- examples/divider/pyproject.toml | 2 +- examples/examples_overview/pyproject.toml | 2 +- examples/focus/pyproject.toml | 2 +- examples/font/pyproject.toml | 2 +- examples/handlers/pyproject.toml | 2 +- examples/imageview/pyproject.toml | 2 +- examples/layout/pyproject.toml | 2 +- examples/multilinetextinput/pyproject.toml | 2 +- examples/numberinput/pyproject.toml | 2 +- examples/optioncontainer/pyproject.toml | 2 +- examples/positron-django/pyproject.toml | 2 +- examples/positron-static/pyproject.toml | 2 +- examples/progressbar/pyproject.toml | 2 +- examples/scrollcontainer/pyproject.toml | 2 +- examples/selection/pyproject.toml | 2 +- examples/slider/pyproject.toml | 2 +- examples/switch_demo/pyproject.toml | 2 +- examples/table/pyproject.toml | 2 +- examples/table_source/pyproject.toml | 2 +- examples/textinput/pyproject.toml | 2 +- examples/tree/pyproject.toml | 2 +- examples/tree_source/pyproject.toml | 2 +- examples/tutorial0/pyproject.toml | 2 +- examples/tutorial1/pyproject.toml | 2 +- examples/tutorial2/pyproject.toml | 2 +- examples/tutorial3/pyproject.toml | 2 +- examples/tutorial4/pyproject.toml | 2 +- examples/webview/pyproject.toml | 2 +- examples/window/pyproject.toml | 2 +- src/android/src/toga_android/__init__.py | 2 +- src/cocoa/src/toga_cocoa/__init__.py | 2 +- src/core/src/toga/__init__.py | 2 +- src/dummy/src/toga_dummy/__init__.py | 2 +- src/gtk/src/toga_gtk/__init__.py | 2 +- src/iOS/src/toga_iOS/__init__.py | 2 +- src/web/src/toga_web/__init__.py | 2 +- src/winforms/src/toga_winforms/__init__.py | 2 +- 50 files changed, 56 insertions(+), 56 deletions(-) diff --git a/demo/pyproject.toml b/demo/pyproject.toml index 93e7f7a1da..bedfc0eb5b 100644 --- a/demo/pyproject.toml +++ b/demo/pyproject.toml @@ -2,7 +2,7 @@ [tool.briefcase] project_name = "Toga Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = "Tiberius Yak" @@ -16,26 +16,26 @@ requires = [] [tool.briefcase.app.toga-demo.macOS] requires = [ - "toga-cocoa==0.0.1rc1", + "toga-cocoa==0.0.1rc5", ] [tool.briefcase.app.toga-demo.linux] requires = [ - "toga-gtk==0.0.1rc1", + "toga-gtk==0.0.1rc5", ] [tool.briefcase.app.toga-demo.windows] requires = [ - "toga-winforms==0.0.1rc1", + "toga-winforms==0.0.1rc5", ] # Mobile deployments [tool.briefcase.app.toga-demo.iOS] requires = [ - "toga-iOS==0.0.1rc1", + "toga-iOS==0.0.1rc5", ] [tool.briefcase.app.toga-demo.android] requires = [ - "toga-android==0.0.1rc1", + "toga-android==0.0.1rc5", ] diff --git a/demo/setup.cfg b/demo/setup.cfg index 074b92ad07..d95f60e81b 100644 --- a/demo/setup.cfg +++ b/demo/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = toga-demo -version = 0.0.1rc1 +version = 0.0.1rc5 description = A demonstration of the capabilities of the Toga widget toolkit. url = https://beeware.org/project/projects/libraries/toga/ project_urls = @@ -47,7 +47,7 @@ keywords = [options] install_requires = - toga==0.0.1rc1 + toga==0.0.1rc5 packages = find: python_requires = >= 3.5 diff --git a/examples/.template/{{ cookiecutter.name }}/pyproject.toml b/examples/.template/{{ cookiecutter.name }}/pyproject.toml index d397262bfc..76a275f998 100644 --- a/examples/.template/{{ cookiecutter.name }}/pyproject.toml +++ b/examples/.template/{{ cookiecutter.name }}/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "{{ cookiecutter.formal_name }}" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/activityindicator/pyproject.toml b/examples/activityindicator/pyproject.toml index 1595ab81b1..e711564533 100644 --- a/examples/activityindicator/pyproject.toml +++ b/examples/activityindicator/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Activity Indicator" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/beeliza/pyproject.toml b/examples/beeliza/pyproject.toml index 1ea503f54c..d5c9ca8999 100644 --- a/examples/beeliza/pyproject.toml +++ b/examples/beeliza/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Beeliza" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/box/pyproject.toml b/examples/box/pyproject.toml index 7919a7bd70..565ab89109 100644 --- a/examples/box/pyproject.toml +++ b/examples/box/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Box Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/button/pyproject.toml b/examples/button/pyproject.toml index 854b10708b..cea5feadab 100644 --- a/examples/button/pyproject.toml +++ b/examples/button/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Button Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/canvas/pyproject.toml b/examples/canvas/pyproject.toml index 13d6280f43..8ad24f95f2 100644 --- a/examples/canvas/pyproject.toml +++ b/examples/canvas/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Canvas Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/colors/pyproject.toml b/examples/colors/pyproject.toml index 55bca188e0..0f50046b3f 100644 --- a/examples/colors/pyproject.toml +++ b/examples/colors/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "colors" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/command/pyproject.toml b/examples/command/pyproject.toml index baa65ec91d..f310b006fa 100644 --- a/examples/command/pyproject.toml +++ b/examples/command/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Command Example" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/date_and_time/pyproject.toml b/examples/date_and_time/pyproject.toml index b3c47c46f2..a1d520f81b 100644 --- a/examples/date_and_time/pyproject.toml +++ b/examples/date_and_time/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Date And Time" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/detailedlist/pyproject.toml b/examples/detailedlist/pyproject.toml index 32522bf2bd..df12ed7999 100644 --- a/examples/detailedlist/pyproject.toml +++ b/examples/detailedlist/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "DetailedList Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/dialogs/pyproject.toml b/examples/dialogs/pyproject.toml index d00ffd1998..e1b93362c3 100644 --- a/examples/dialogs/pyproject.toml +++ b/examples/dialogs/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Dialog Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/divider/pyproject.toml b/examples/divider/pyproject.toml index 765eec5587..89b6e3a7bf 100644 --- a/examples/divider/pyproject.toml +++ b/examples/divider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Divider Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/examples_overview/pyproject.toml b/examples/examples_overview/pyproject.toml index 1bf4fffd27..9a272bc19f 100644 --- a/examples/examples_overview/pyproject.toml +++ b/examples/examples_overview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Examples Overview" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/focus/pyproject.toml b/examples/focus/pyproject.toml index bfb9539f39..f4f55d227a 100644 --- a/examples/focus/pyproject.toml +++ b/examples/focus/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Focus Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/font/pyproject.toml b/examples/font/pyproject.toml index 581bed42a6..198ef28c1c 100644 --- a/examples/font/pyproject.toml +++ b/examples/font/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Font Example" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/handlers/pyproject.toml b/examples/handlers/pyproject.toml index fd91f87da0..e81efb6dc0 100644 --- a/examples/handlers/pyproject.toml +++ b/examples/handlers/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Handler Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/imageview/pyproject.toml b/examples/imageview/pyproject.toml index 555951e632..f05189f99a 100644 --- a/examples/imageview/pyproject.toml +++ b/examples/imageview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ImageView Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/layout/pyproject.toml b/examples/layout/pyproject.toml index 2cfbc74ed4..67e95b76ea 100644 --- a/examples/layout/pyproject.toml +++ b/examples/layout/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Layout Test" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/multilinetextinput/pyproject.toml b/examples/multilinetextinput/pyproject.toml index 24ef87c57b..15e3a9beb1 100644 --- a/examples/multilinetextinput/pyproject.toml +++ b/examples/multilinetextinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "MultilineTextInput Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/numberinput/pyproject.toml b/examples/numberinput/pyproject.toml index f072d736e7..6c51e5e546 100644 --- a/examples/numberinput/pyproject.toml +++ b/examples/numberinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Demo NumberInput" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/optioncontainer/pyproject.toml b/examples/optioncontainer/pyproject.toml index c7adf4a73d..2ab8059a29 100644 --- a/examples/optioncontainer/pyproject.toml +++ b/examples/optioncontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Option Container Example" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-django/pyproject.toml b/examples/positron-django/pyproject.toml index 0707f81b73..7200924168 100644 --- a/examples/positron-django/pyproject.toml +++ b/examples/positron-django/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-static/pyproject.toml b/examples/positron-static/pyproject.toml index 6addba5ed0..1c0d8dc2c3 100644 --- a/examples/positron-static/pyproject.toml +++ b/examples/positron-static/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/progressbar/pyproject.toml b/examples/progressbar/pyproject.toml index 97cce821f4..4952954ac6 100644 --- a/examples/progressbar/pyproject.toml +++ b/examples/progressbar/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ProgressBar demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/scrollcontainer/pyproject.toml b/examples/scrollcontainer/pyproject.toml index 55f893f388..45dfad5cf9 100644 --- a/examples/scrollcontainer/pyproject.toml +++ b/examples/scrollcontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ScrollContainer Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/selection/pyproject.toml b/examples/selection/pyproject.toml index ea1253af5c..b50ee7fc15 100644 --- a/examples/selection/pyproject.toml +++ b/examples/selection/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Selection Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/slider/pyproject.toml b/examples/slider/pyproject.toml index a478bcd998..c4d07b2b79 100644 --- a/examples/slider/pyproject.toml +++ b/examples/slider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Slider Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/switch_demo/pyproject.toml b/examples/switch_demo/pyproject.toml index 9f09f61914..b976fe844d 100644 --- a/examples/switch_demo/pyproject.toml +++ b/examples/switch_demo/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Switch Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table/pyproject.toml b/examples/table/pyproject.toml index 97ca3a42ea..e6f1be61d3 100644 --- a/examples/table/pyproject.toml +++ b/examples/table/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Table Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table_source/pyproject.toml b/examples/table_source/pyproject.toml index ac0c63cbf9..d9bf3be93f 100644 --- a/examples/table_source/pyproject.toml +++ b/examples/table_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TableSource Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/textinput/pyproject.toml b/examples/textinput/pyproject.toml index a771ee620a..504005eb78 100644 --- a/examples/textinput/pyproject.toml +++ b/examples/textinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Text Input Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree/pyproject.toml b/examples/tree/pyproject.toml index 87421372c9..3ddd1b9ab8 100644 --- a/examples/tree/pyproject.toml +++ b/examples/tree/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tree Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree_source/pyproject.toml b/examples/tree_source/pyproject.toml index cf1d252c29..c08014fd2a 100644 --- a/examples/tree_source/pyproject.toml +++ b/examples/tree_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TreeSource Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial0/pyproject.toml b/examples/tutorial0/pyproject.toml index 4e9fd310b5..50fef6bcf6 100644 --- a/examples/tutorial0/pyproject.toml +++ b/examples/tutorial0/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 0" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial1/pyproject.toml b/examples/tutorial1/pyproject.toml index f1b54b172d..0a6649c31d 100644 --- a/examples/tutorial1/pyproject.toml +++ b/examples/tutorial1/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 1" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial2/pyproject.toml b/examples/tutorial2/pyproject.toml index dc8c3b3885..8c6f3ae7d9 100644 --- a/examples/tutorial2/pyproject.toml +++ b/examples/tutorial2/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 2" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial3/pyproject.toml b/examples/tutorial3/pyproject.toml index 2dba54dc48..70e7fdc108 100644 --- a/examples/tutorial3/pyproject.toml +++ b/examples/tutorial3/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 3" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial4/pyproject.toml b/examples/tutorial4/pyproject.toml index e8a327bd14..3a3691e7d0 100644 --- a/examples/tutorial4/pyproject.toml +++ b/examples/tutorial4/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 4" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/webview/pyproject.toml b/examples/webview/pyproject.toml index c225fb2416..be265890b1 100644 --- a/examples/webview/pyproject.toml +++ b/examples/webview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "WebView Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/window/pyproject.toml b/examples/window/pyproject.toml index a899f13dee..03817476dc 100644 --- a/examples/window/pyproject.toml +++ b/examples/window/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Window Demo" bundle = "org.beeware" -version = "0.0.1rc1" +version = "0.0.1rc5" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/src/android/src/toga_android/__init__.py b/src/android/src/toga_android/__init__.py index e79434d5d0..901148e4af 100644 --- a/src/android/src/toga_android/__init__.py +++ b/src/android/src/toga_android/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' diff --git a/src/cocoa/src/toga_cocoa/__init__.py b/src/cocoa/src/toga_cocoa/__init__.py index e79434d5d0..901148e4af 100644 --- a/src/cocoa/src/toga_cocoa/__init__.py +++ b/src/cocoa/src/toga_cocoa/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' diff --git a/src/core/src/toga/__init__.py b/src/core/src/toga/__init__.py index ffad00eead..8e40b3f5e0 100644 --- a/src/core/src/toga/__init__.py +++ b/src/core/src/toga/__init__.py @@ -88,4 +88,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' diff --git a/src/dummy/src/toga_dummy/__init__.py b/src/dummy/src/toga_dummy/__init__.py index 2de8875f84..8c75d3775b 100644 --- a/src/dummy/src/toga_dummy/__init__.py +++ b/src/dummy/src/toga_dummy/__init__.py @@ -8,4 +8,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' diff --git a/src/gtk/src/toga_gtk/__init__.py b/src/gtk/src/toga_gtk/__init__.py index e79434d5d0..901148e4af 100644 --- a/src/gtk/src/toga_gtk/__init__.py +++ b/src/gtk/src/toga_gtk/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' diff --git a/src/iOS/src/toga_iOS/__init__.py b/src/iOS/src/toga_iOS/__init__.py index e79434d5d0..901148e4af 100644 --- a/src/iOS/src/toga_iOS/__init__.py +++ b/src/iOS/src/toga_iOS/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' diff --git a/src/web/src/toga_web/__init__.py b/src/web/src/toga_web/__init__.py index e79434d5d0..901148e4af 100644 --- a/src/web/src/toga_web/__init__.py +++ b/src/web/src/toga_web/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' diff --git a/src/winforms/src/toga_winforms/__init__.py b/src/winforms/src/toga_winforms/__init__.py index e79434d5d0..901148e4af 100644 --- a/src/winforms/src/toga_winforms/__init__.py +++ b/src/winforms/src/toga_winforms/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc1' +__version__ = '0.0.1rc5' From e7715dae258e7d1664aaef10a5ba9b332e06612a Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 21:28:53 +0100 Subject: [PATCH 16/19] Add release checklist --- docs/how-to/index.rst | 1 + docs/how-to/release.rst | 82 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 docs/how-to/release.rst diff --git a/docs/how-to/index.rst b/docs/how-to/index.rst index 28a0c9e369..765ccc73a9 100644 --- a/docs/how-to/index.rst +++ b/docs/how-to/index.rst @@ -10,3 +10,4 @@ How-to Guides Get started Contribute to Toga + Cut a Toga release diff --git a/docs/how-to/release.rst b/docs/how-to/release.rst new file mode 100644 index 0000000000..0a916c054e --- /dev/null +++ b/docs/how-to/release.rst @@ -0,0 +1,82 @@ +============================== +How to cut a Toga release +============================== + +The release infrastructure for Toga is semi-automated, using GitHub +Actions to formally publish releases. + +This guide assumes that you have an ``upstream`` remote configured on your +local clone of the Toga repository, pointing at the official repository. +If all you have is a checkout of a personal fork of the Toga repository, +you can configure that checkout by running:: + + $ git remote add upstream https://github.com/beeware/toga.git + +The procedure for cutting a new release is as follows: + +#. Check the contents of the upstream repository's main branch:: + + $ git fetch upstream + $ git checkout --detach upstream/main + + Check that the HEAD of release now matches upstream/main. + +#. If necessary, update the version number:: + + $ ./release.sh bump 1.2.3 + +#. Tag the release, and push the branch and tag upstream:: + + $ git tag v1.2.3 + $ git push upstream main + $ git push upstream v1.2.3 + +#. Pushing the tag will start a workflow to create a draft release on GitHub. + You can `follow the progress of the workflow on GitHub + `__; + once the workflow completes, there should be a new `draft release + `__, and entries on the TestPyPI + server for `toga-core `__, + `toga-cocoa `__, etc. + + Confirm that this action successfully completes. If it fails, there's a + couple of possible causes: + + a. The final upload to TestPyPI failed. TestPyPI doesn't have the same + service monitoring as PyPI-proper, so it sometimes has problems. However, + it's not critical to the release process. + b. Something else fails in the build process. If the problem can be fixed + without a code change to the Toga repository (e.g., a transient + problem with build machines not being available), you can re-run the + action that failed through the Github Actions GUI. If the fix requires a + code change, delete the old tag, make the code change, and re-tag the + release. + +#. Download the "packages" artifact from the GitHub workflow, and use its wheels + to build some apps and perform any pre-release testing that may be appropriate. + +#. Log into ReadTheDocs, visit the `Versions tab + `__, and activate the + new version. Ensure that the build completes; if there's a problem, you + may need to correct the build configuration, roll back and re-tag the release. + +#. Edit the GitHub release. Add release notes. Check the pre-release checkbox if + necessary. + +#. Double check everything, then click Publish. This will trigger a + `publication workflow on GitHub + `__. + +#. Wait for the packages to appear on PyPI (`toga-core + `__, `toga-cocoa + `__, etc.). + +#. Set the version number for the next release:: + + $ ./release.sh bump 1.2.4 + +Congratulations, you've just published a release! + +Once the release has successfully appeared on PyPI or TestPyPI, it cannot be +changed. If you spot a problem after that point, you'll need to restart with +a new version number. From 01e26e29e5fdce26bff168b3de56a1d16afaad34 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 21:30:02 +0100 Subject: [PATCH 17/19] Enable all tests --- .github/workflows/ci.yml | 165 +++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 83 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81b2bf69d2..8d9c015d13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,87 +55,86 @@ jobs: path: packages if-no-files-found: error - # FIXME - # core: - # needs: package - # strategy: - # matrix: - # platform: ['macos', 'ubuntu', 'windows'] - # python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] - # runs-on: ${{ matrix.platform }}-latest - # steps: - # - uses: actions/checkout@v1 - # - name: Set up Python ${{ matrix.python-version }} - # uses: actions/setup-python@v3.1.2 - # with: - # python-version: ${{ matrix.python-version }} - # - name: Install dependencies - # run: | - # python -m pip install --upgrade pip - # python -m pip install --upgrade setuptools - # python -m pip install --upgrade tox - # - name: Get packages - # uses: actions/download-artifact@v3 - # with: - # name: packages - # path: packages - # - name: Test - # env: - # TOGA_INSTALL_COMMAND: 'bash -c "pip install packages/toga_{core,dummy}*.whl"' - # run: | - # tox -e py - # - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version - # uses: codecov/codecov-action@v1 - # with: - # token: ${{ secrets.CODECOV_TOKEN }} - # file: ./coverage.xml - # flags: unittests - # fail_ci_if_error: true + core: + needs: package + strategy: + matrix: + platform: ['macos', 'ubuntu', 'windows'] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"] + runs-on: ${{ matrix.platform }}-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3.1.2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools + python -m pip install --upgrade tox + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages + path: packages + - name: Test + env: + TOGA_INSTALL_COMMAND: 'bash -c "pip install packages/toga_{core,dummy}*.whl"' + run: | + tox -e py + - if: matrix.platform == 'ubuntu' && matrix.python-version == env.min_python_version + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: ./coverage.xml + flags: unittests + fail_ci_if_error: true - # backend: - # needs: package - # strategy: - # matrix: - # backend: [android, cocoa, gtk, iOS, web, winforms] - # include: - # - runs-on: ubuntu-latest - # - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) - # - pre-command: - # - test-command: pytest - # - backend: cocoa - # runs-on: macos-latest - # - backend: gtk - # pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" - # test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" - # - 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" - # runs-on: ${{ matrix.runs-on }} - # steps: - # - uses: actions/checkout@v1 - # - name: Set up Python ${{ matrix.python-version }} - # uses: actions/setup-python@v3.1.2 - # with: - # # Py3.9 is the first Python version for which - # # a wheel of pythonnet isn't available on PyPI. - # python-version: ${{ matrix.python-version }} - # - name: Get packages - # uses: actions/download-artifact@v3 - # with: - # name: packages - # path: packages - # - name: Install dependencies - # run: | - # ${{ matrix.pre-command }} - # python -m pip install --upgrade pip - # python -m pip install --upgrade setuptools - # python -m pip install pytest-tldr - # python -m pip install packages/toga_{core,dummy,${{ matrix.backend }}}*.whl - # - name: Test - # run: | - # cd src/${{ matrix.backend }} - # ${{ matrix.test-command }} + backend: + needs: package + strategy: + matrix: + backend: [android, cocoa, gtk, iOS, web, winforms] + include: + - runs-on: ubuntu-latest + - python-version: "3.7" # Should be env.min_python_version (https://github.com/actions/runner/issues/480) + - pre-command: + - test-command: pytest + - backend: cocoa + runs-on: macos-latest + - backend: gtk + pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config" + test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest" + - 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" + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3.1.2 + with: + # Py3.9 is the first Python version for which + # a wheel of pythonnet isn't available on PyPI. + python-version: ${{ matrix.python-version }} + - name: Get packages + uses: actions/download-artifact@v3 + with: + name: packages + path: packages + - name: Install dependencies + run: | + ${{ matrix.pre-command }} + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools + python -m pip install pytest-tldr + python -m pip install packages/toga_{core,dummy,${{ matrix.backend }}}*.whl + - name: Test + run: | + cd src/${{ matrix.backend }} + ${{ matrix.test-command }} From 66b618f50da4ffd62eca6d6539bbe2f75f6fec48 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 21:30:36 +0100 Subject: [PATCH 18/19] Bumped version number for v0.0.1rc6 release. --- demo/pyproject.toml | 12 ++++++------ demo/setup.cfg | 4 ++-- .../.template/{{ cookiecutter.name }}/pyproject.toml | 2 +- examples/activityindicator/pyproject.toml | 2 +- examples/beeliza/pyproject.toml | 2 +- examples/box/pyproject.toml | 2 +- examples/button/pyproject.toml | 2 +- examples/canvas/pyproject.toml | 2 +- examples/colors/pyproject.toml | 2 +- examples/command/pyproject.toml | 2 +- examples/date_and_time/pyproject.toml | 2 +- examples/detailedlist/pyproject.toml | 2 +- examples/dialogs/pyproject.toml | 2 +- examples/divider/pyproject.toml | 2 +- examples/examples_overview/pyproject.toml | 2 +- examples/focus/pyproject.toml | 2 +- examples/font/pyproject.toml | 2 +- examples/handlers/pyproject.toml | 2 +- examples/imageview/pyproject.toml | 2 +- examples/layout/pyproject.toml | 2 +- examples/multilinetextinput/pyproject.toml | 2 +- examples/numberinput/pyproject.toml | 2 +- examples/optioncontainer/pyproject.toml | 2 +- examples/positron-django/pyproject.toml | 2 +- examples/positron-static/pyproject.toml | 2 +- examples/progressbar/pyproject.toml | 2 +- examples/scrollcontainer/pyproject.toml | 2 +- examples/selection/pyproject.toml | 2 +- examples/slider/pyproject.toml | 2 +- examples/switch_demo/pyproject.toml | 2 +- examples/table/pyproject.toml | 2 +- examples/table_source/pyproject.toml | 2 +- examples/textinput/pyproject.toml | 2 +- examples/tree/pyproject.toml | 2 +- examples/tree_source/pyproject.toml | 2 +- examples/tutorial0/pyproject.toml | 2 +- examples/tutorial1/pyproject.toml | 2 +- examples/tutorial2/pyproject.toml | 2 +- examples/tutorial3/pyproject.toml | 2 +- examples/tutorial4/pyproject.toml | 2 +- examples/webview/pyproject.toml | 2 +- examples/window/pyproject.toml | 2 +- src/android/src/toga_android/__init__.py | 2 +- src/cocoa/src/toga_cocoa/__init__.py | 2 +- src/core/src/toga/__init__.py | 2 +- src/dummy/src/toga_dummy/__init__.py | 2 +- src/gtk/src/toga_gtk/__init__.py | 2 +- src/iOS/src/toga_iOS/__init__.py | 2 +- src/web/src/toga_web/__init__.py | 2 +- src/winforms/src/toga_winforms/__init__.py | 2 +- 50 files changed, 56 insertions(+), 56 deletions(-) diff --git a/demo/pyproject.toml b/demo/pyproject.toml index bedfc0eb5b..0672b1f61e 100644 --- a/demo/pyproject.toml +++ b/demo/pyproject.toml @@ -2,7 +2,7 @@ [tool.briefcase] project_name = "Toga Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = "Tiberius Yak" @@ -16,26 +16,26 @@ requires = [] [tool.briefcase.app.toga-demo.macOS] requires = [ - "toga-cocoa==0.0.1rc5", + "toga-cocoa==0.0.1rc6", ] [tool.briefcase.app.toga-demo.linux] requires = [ - "toga-gtk==0.0.1rc5", + "toga-gtk==0.0.1rc6", ] [tool.briefcase.app.toga-demo.windows] requires = [ - "toga-winforms==0.0.1rc5", + "toga-winforms==0.0.1rc6", ] # Mobile deployments [tool.briefcase.app.toga-demo.iOS] requires = [ - "toga-iOS==0.0.1rc5", + "toga-iOS==0.0.1rc6", ] [tool.briefcase.app.toga-demo.android] requires = [ - "toga-android==0.0.1rc5", + "toga-android==0.0.1rc6", ] diff --git a/demo/setup.cfg b/demo/setup.cfg index d95f60e81b..ff4de29fcb 100644 --- a/demo/setup.cfg +++ b/demo/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = toga-demo -version = 0.0.1rc5 +version = 0.0.1rc6 description = A demonstration of the capabilities of the Toga widget toolkit. url = https://beeware.org/project/projects/libraries/toga/ project_urls = @@ -47,7 +47,7 @@ keywords = [options] install_requires = - toga==0.0.1rc5 + toga==0.0.1rc6 packages = find: python_requires = >= 3.5 diff --git a/examples/.template/{{ cookiecutter.name }}/pyproject.toml b/examples/.template/{{ cookiecutter.name }}/pyproject.toml index 76a275f998..663461f0f9 100644 --- a/examples/.template/{{ cookiecutter.name }}/pyproject.toml +++ b/examples/.template/{{ cookiecutter.name }}/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "{{ cookiecutter.formal_name }}" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/activityindicator/pyproject.toml b/examples/activityindicator/pyproject.toml index e711564533..243f75a0ea 100644 --- a/examples/activityindicator/pyproject.toml +++ b/examples/activityindicator/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Activity Indicator" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/beeliza/pyproject.toml b/examples/beeliza/pyproject.toml index d5c9ca8999..6822d8677b 100644 --- a/examples/beeliza/pyproject.toml +++ b/examples/beeliza/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Beeliza" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/box/pyproject.toml b/examples/box/pyproject.toml index 565ab89109..9b3bc9a4df 100644 --- a/examples/box/pyproject.toml +++ b/examples/box/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Box Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/button/pyproject.toml b/examples/button/pyproject.toml index cea5feadab..4d2605f401 100644 --- a/examples/button/pyproject.toml +++ b/examples/button/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Button Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/canvas/pyproject.toml b/examples/canvas/pyproject.toml index 8ad24f95f2..512b022d8d 100644 --- a/examples/canvas/pyproject.toml +++ b/examples/canvas/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Canvas Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/colors/pyproject.toml b/examples/colors/pyproject.toml index 0f50046b3f..7bf9630f3e 100644 --- a/examples/colors/pyproject.toml +++ b/examples/colors/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "colors" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/command/pyproject.toml b/examples/command/pyproject.toml index f310b006fa..d5df514770 100644 --- a/examples/command/pyproject.toml +++ b/examples/command/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Command Example" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/date_and_time/pyproject.toml b/examples/date_and_time/pyproject.toml index a1d520f81b..8a9836981e 100644 --- a/examples/date_and_time/pyproject.toml +++ b/examples/date_and_time/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Date And Time" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/detailedlist/pyproject.toml b/examples/detailedlist/pyproject.toml index df12ed7999..90f6c91480 100644 --- a/examples/detailedlist/pyproject.toml +++ b/examples/detailedlist/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "DetailedList Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/dialogs/pyproject.toml b/examples/dialogs/pyproject.toml index e1b93362c3..f865530d5b 100644 --- a/examples/dialogs/pyproject.toml +++ b/examples/dialogs/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Dialog Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/divider/pyproject.toml b/examples/divider/pyproject.toml index 89b6e3a7bf..ba4afdfbbd 100644 --- a/examples/divider/pyproject.toml +++ b/examples/divider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Divider Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/examples_overview/pyproject.toml b/examples/examples_overview/pyproject.toml index 9a272bc19f..9cc1c95688 100644 --- a/examples/examples_overview/pyproject.toml +++ b/examples/examples_overview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Examples Overview" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/focus/pyproject.toml b/examples/focus/pyproject.toml index f4f55d227a..a9676d8cd8 100644 --- a/examples/focus/pyproject.toml +++ b/examples/focus/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Focus Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/font/pyproject.toml b/examples/font/pyproject.toml index 198ef28c1c..0ec38bd6fb 100644 --- a/examples/font/pyproject.toml +++ b/examples/font/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Font Example" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/handlers/pyproject.toml b/examples/handlers/pyproject.toml index e81efb6dc0..2f260d4c83 100644 --- a/examples/handlers/pyproject.toml +++ b/examples/handlers/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Handler Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/imageview/pyproject.toml b/examples/imageview/pyproject.toml index f05189f99a..3fc44e44cc 100644 --- a/examples/imageview/pyproject.toml +++ b/examples/imageview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ImageView Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/layout/pyproject.toml b/examples/layout/pyproject.toml index 67e95b76ea..e7b22f9406 100644 --- a/examples/layout/pyproject.toml +++ b/examples/layout/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Layout Test" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/multilinetextinput/pyproject.toml b/examples/multilinetextinput/pyproject.toml index 15e3a9beb1..e2a47bf039 100644 --- a/examples/multilinetextinput/pyproject.toml +++ b/examples/multilinetextinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "MultilineTextInput Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/numberinput/pyproject.toml b/examples/numberinput/pyproject.toml index 6c51e5e546..64c2677e4d 100644 --- a/examples/numberinput/pyproject.toml +++ b/examples/numberinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Demo NumberInput" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/optioncontainer/pyproject.toml b/examples/optioncontainer/pyproject.toml index 2ab8059a29..50707dd726 100644 --- a/examples/optioncontainer/pyproject.toml +++ b/examples/optioncontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Option Container Example" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-django/pyproject.toml b/examples/positron-django/pyproject.toml index 7200924168..256ccf26ba 100644 --- a/examples/positron-django/pyproject.toml +++ b/examples/positron-django/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-static/pyproject.toml b/examples/positron-static/pyproject.toml index 1c0d8dc2c3..a6f0787890 100644 --- a/examples/positron-static/pyproject.toml +++ b/examples/positron-static/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/progressbar/pyproject.toml b/examples/progressbar/pyproject.toml index 4952954ac6..c202233651 100644 --- a/examples/progressbar/pyproject.toml +++ b/examples/progressbar/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ProgressBar demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/scrollcontainer/pyproject.toml b/examples/scrollcontainer/pyproject.toml index 45dfad5cf9..a69145b040 100644 --- a/examples/scrollcontainer/pyproject.toml +++ b/examples/scrollcontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ScrollContainer Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/selection/pyproject.toml b/examples/selection/pyproject.toml index b50ee7fc15..a0f3eed800 100644 --- a/examples/selection/pyproject.toml +++ b/examples/selection/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Selection Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/slider/pyproject.toml b/examples/slider/pyproject.toml index c4d07b2b79..2ae6cc7c9f 100644 --- a/examples/slider/pyproject.toml +++ b/examples/slider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Slider Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/switch_demo/pyproject.toml b/examples/switch_demo/pyproject.toml index b976fe844d..925924e689 100644 --- a/examples/switch_demo/pyproject.toml +++ b/examples/switch_demo/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Switch Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table/pyproject.toml b/examples/table/pyproject.toml index e6f1be61d3..d630ab4625 100644 --- a/examples/table/pyproject.toml +++ b/examples/table/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Table Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table_source/pyproject.toml b/examples/table_source/pyproject.toml index d9bf3be93f..4ca4841e20 100644 --- a/examples/table_source/pyproject.toml +++ b/examples/table_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TableSource Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/textinput/pyproject.toml b/examples/textinput/pyproject.toml index 504005eb78..dc74650c51 100644 --- a/examples/textinput/pyproject.toml +++ b/examples/textinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Text Input Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree/pyproject.toml b/examples/tree/pyproject.toml index 3ddd1b9ab8..3efffe07c8 100644 --- a/examples/tree/pyproject.toml +++ b/examples/tree/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tree Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree_source/pyproject.toml b/examples/tree_source/pyproject.toml index c08014fd2a..eb2fef8510 100644 --- a/examples/tree_source/pyproject.toml +++ b/examples/tree_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TreeSource Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial0/pyproject.toml b/examples/tutorial0/pyproject.toml index 50fef6bcf6..b49e24a713 100644 --- a/examples/tutorial0/pyproject.toml +++ b/examples/tutorial0/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 0" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial1/pyproject.toml b/examples/tutorial1/pyproject.toml index 0a6649c31d..07037c135d 100644 --- a/examples/tutorial1/pyproject.toml +++ b/examples/tutorial1/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 1" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial2/pyproject.toml b/examples/tutorial2/pyproject.toml index 8c6f3ae7d9..80a322efd3 100644 --- a/examples/tutorial2/pyproject.toml +++ b/examples/tutorial2/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 2" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial3/pyproject.toml b/examples/tutorial3/pyproject.toml index 70e7fdc108..54aa5bf0da 100644 --- a/examples/tutorial3/pyproject.toml +++ b/examples/tutorial3/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 3" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial4/pyproject.toml b/examples/tutorial4/pyproject.toml index 3a3691e7d0..ef3c73506f 100644 --- a/examples/tutorial4/pyproject.toml +++ b/examples/tutorial4/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 4" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/webview/pyproject.toml b/examples/webview/pyproject.toml index be265890b1..757abefd7e 100644 --- a/examples/webview/pyproject.toml +++ b/examples/webview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "WebView Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/window/pyproject.toml b/examples/window/pyproject.toml index 03817476dc..f1c277f1fa 100644 --- a/examples/window/pyproject.toml +++ b/examples/window/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Window Demo" bundle = "org.beeware" -version = "0.0.1rc5" +version = "0.0.1rc6" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/src/android/src/toga_android/__init__.py b/src/android/src/toga_android/__init__.py index 901148e4af..e94d8ec033 100644 --- a/src/android/src/toga_android/__init__.py +++ b/src/android/src/toga_android/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' diff --git a/src/cocoa/src/toga_cocoa/__init__.py b/src/cocoa/src/toga_cocoa/__init__.py index 901148e4af..e94d8ec033 100644 --- a/src/cocoa/src/toga_cocoa/__init__.py +++ b/src/cocoa/src/toga_cocoa/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' diff --git a/src/core/src/toga/__init__.py b/src/core/src/toga/__init__.py index 8e40b3f5e0..c6faaa6cda 100644 --- a/src/core/src/toga/__init__.py +++ b/src/core/src/toga/__init__.py @@ -88,4 +88,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' diff --git a/src/dummy/src/toga_dummy/__init__.py b/src/dummy/src/toga_dummy/__init__.py index 8c75d3775b..f5c188b614 100644 --- a/src/dummy/src/toga_dummy/__init__.py +++ b/src/dummy/src/toga_dummy/__init__.py @@ -8,4 +8,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' diff --git a/src/gtk/src/toga_gtk/__init__.py b/src/gtk/src/toga_gtk/__init__.py index 901148e4af..e94d8ec033 100644 --- a/src/gtk/src/toga_gtk/__init__.py +++ b/src/gtk/src/toga_gtk/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' diff --git a/src/iOS/src/toga_iOS/__init__.py b/src/iOS/src/toga_iOS/__init__.py index 901148e4af..e94d8ec033 100644 --- a/src/iOS/src/toga_iOS/__init__.py +++ b/src/iOS/src/toga_iOS/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' diff --git a/src/web/src/toga_web/__init__.py b/src/web/src/toga_web/__init__.py index 901148e4af..e94d8ec033 100644 --- a/src/web/src/toga_web/__init__.py +++ b/src/web/src/toga_web/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' diff --git a/src/winforms/src/toga_winforms/__init__.py b/src/winforms/src/toga_winforms/__init__.py index 901148e4af..e94d8ec033 100644 --- a/src/winforms/src/toga_winforms/__init__.py +++ b/src/winforms/src/toga_winforms/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc5' +__version__ = '0.0.1rc6' From e9f5d00733adfe54639f95d592d7b95c66b09793 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 18 Oct 2022 21:35:51 +0100 Subject: [PATCH 19/19] Bumped version number for v0.3.0.dev39 development. --- demo/pyproject.toml | 12 ++++++------ demo/setup.cfg | 4 ++-- .../.template/{{ cookiecutter.name }}/pyproject.toml | 2 +- examples/activityindicator/pyproject.toml | 2 +- examples/beeliza/pyproject.toml | 2 +- examples/box/pyproject.toml | 2 +- examples/button/pyproject.toml | 2 +- examples/canvas/pyproject.toml | 2 +- examples/colors/pyproject.toml | 2 +- examples/command/pyproject.toml | 2 +- examples/date_and_time/pyproject.toml | 2 +- examples/detailedlist/pyproject.toml | 2 +- examples/dialogs/pyproject.toml | 2 +- examples/divider/pyproject.toml | 2 +- examples/examples_overview/pyproject.toml | 2 +- examples/focus/pyproject.toml | 2 +- examples/font/pyproject.toml | 2 +- examples/handlers/pyproject.toml | 2 +- examples/imageview/pyproject.toml | 2 +- examples/layout/pyproject.toml | 2 +- examples/multilinetextinput/pyproject.toml | 2 +- examples/numberinput/pyproject.toml | 2 +- examples/optioncontainer/pyproject.toml | 2 +- examples/positron-django/pyproject.toml | 2 +- examples/positron-static/pyproject.toml | 2 +- examples/progressbar/pyproject.toml | 2 +- examples/scrollcontainer/pyproject.toml | 2 +- examples/selection/pyproject.toml | 2 +- examples/slider/pyproject.toml | 2 +- examples/switch_demo/pyproject.toml | 2 +- examples/table/pyproject.toml | 2 +- examples/table_source/pyproject.toml | 2 +- examples/textinput/pyproject.toml | 2 +- examples/tree/pyproject.toml | 2 +- examples/tree_source/pyproject.toml | 2 +- examples/tutorial0/pyproject.toml | 2 +- examples/tutorial1/pyproject.toml | 2 +- examples/tutorial2/pyproject.toml | 2 +- examples/tutorial3/pyproject.toml | 2 +- examples/tutorial4/pyproject.toml | 2 +- examples/webview/pyproject.toml | 2 +- examples/window/pyproject.toml | 2 +- src/android/src/toga_android/__init__.py | 2 +- src/cocoa/src/toga_cocoa/__init__.py | 2 +- src/core/src/toga/__init__.py | 2 +- src/dummy/src/toga_dummy/__init__.py | 2 +- src/gtk/src/toga_gtk/__init__.py | 2 +- src/iOS/src/toga_iOS/__init__.py | 2 +- src/web/src/toga_web/__init__.py | 2 +- src/winforms/src/toga_winforms/__init__.py | 2 +- 50 files changed, 56 insertions(+), 56 deletions(-) diff --git a/demo/pyproject.toml b/demo/pyproject.toml index 0672b1f61e..31f18bd50a 100644 --- a/demo/pyproject.toml +++ b/demo/pyproject.toml @@ -2,7 +2,7 @@ [tool.briefcase] project_name = "Toga Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = "Tiberius Yak" @@ -16,26 +16,26 @@ requires = [] [tool.briefcase.app.toga-demo.macOS] requires = [ - "toga-cocoa==0.0.1rc6", + "toga-cocoa==0.3.0.dev39", ] [tool.briefcase.app.toga-demo.linux] requires = [ - "toga-gtk==0.0.1rc6", + "toga-gtk==0.3.0.dev39", ] [tool.briefcase.app.toga-demo.windows] requires = [ - "toga-winforms==0.0.1rc6", + "toga-winforms==0.3.0.dev39", ] # Mobile deployments [tool.briefcase.app.toga-demo.iOS] requires = [ - "toga-iOS==0.0.1rc6", + "toga-iOS==0.3.0.dev39", ] [tool.briefcase.app.toga-demo.android] requires = [ - "toga-android==0.0.1rc6", + "toga-android==0.3.0.dev39", ] diff --git a/demo/setup.cfg b/demo/setup.cfg index ff4de29fcb..f34d466b45 100644 --- a/demo/setup.cfg +++ b/demo/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = toga-demo -version = 0.0.1rc6 +version = 0.3.0.dev39 description = A demonstration of the capabilities of the Toga widget toolkit. url = https://beeware.org/project/projects/libraries/toga/ project_urls = @@ -47,7 +47,7 @@ keywords = [options] install_requires = - toga==0.0.1rc6 + toga==0.3.0.dev39 packages = find: python_requires = >= 3.5 diff --git a/examples/.template/{{ cookiecutter.name }}/pyproject.toml b/examples/.template/{{ cookiecutter.name }}/pyproject.toml index 663461f0f9..ec6e516d19 100644 --- a/examples/.template/{{ cookiecutter.name }}/pyproject.toml +++ b/examples/.template/{{ cookiecutter.name }}/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "{{ cookiecutter.formal_name }}" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/activityindicator/pyproject.toml b/examples/activityindicator/pyproject.toml index 243f75a0ea..9d2b5bc2b5 100644 --- a/examples/activityindicator/pyproject.toml +++ b/examples/activityindicator/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Activity Indicator" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/beeliza/pyproject.toml b/examples/beeliza/pyproject.toml index 6822d8677b..4cd338c926 100644 --- a/examples/beeliza/pyproject.toml +++ b/examples/beeliza/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Beeliza" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/box/pyproject.toml b/examples/box/pyproject.toml index 9b3bc9a4df..542b05b9ee 100644 --- a/examples/box/pyproject.toml +++ b/examples/box/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Box Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/button/pyproject.toml b/examples/button/pyproject.toml index 4d2605f401..f31644e598 100644 --- a/examples/button/pyproject.toml +++ b/examples/button/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Button Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/canvas/pyproject.toml b/examples/canvas/pyproject.toml index 512b022d8d..0715f0a08b 100644 --- a/examples/canvas/pyproject.toml +++ b/examples/canvas/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Canvas Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/colors/pyproject.toml b/examples/colors/pyproject.toml index 7bf9630f3e..1e1aa613c9 100644 --- a/examples/colors/pyproject.toml +++ b/examples/colors/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "colors" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/command/pyproject.toml b/examples/command/pyproject.toml index d5df514770..905ddf2ce5 100644 --- a/examples/command/pyproject.toml +++ b/examples/command/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Command Example" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/date_and_time/pyproject.toml b/examples/date_and_time/pyproject.toml index 8a9836981e..92a56ee6a8 100644 --- a/examples/date_and_time/pyproject.toml +++ b/examples/date_and_time/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Date And Time" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/detailedlist/pyproject.toml b/examples/detailedlist/pyproject.toml index 90f6c91480..29a36a6c63 100644 --- a/examples/detailedlist/pyproject.toml +++ b/examples/detailedlist/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "DetailedList Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/dialogs/pyproject.toml b/examples/dialogs/pyproject.toml index f865530d5b..bc2f183665 100644 --- a/examples/dialogs/pyproject.toml +++ b/examples/dialogs/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Dialog Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/divider/pyproject.toml b/examples/divider/pyproject.toml index ba4afdfbbd..17cbcb20a1 100644 --- a/examples/divider/pyproject.toml +++ b/examples/divider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Divider Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/examples_overview/pyproject.toml b/examples/examples_overview/pyproject.toml index 9cc1c95688..0b7e060cc6 100644 --- a/examples/examples_overview/pyproject.toml +++ b/examples/examples_overview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Examples Overview" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/focus/pyproject.toml b/examples/focus/pyproject.toml index a9676d8cd8..44a4d828d7 100644 --- a/examples/focus/pyproject.toml +++ b/examples/focus/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Focus Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/font/pyproject.toml b/examples/font/pyproject.toml index 0ec38bd6fb..cdb0e84ea7 100644 --- a/examples/font/pyproject.toml +++ b/examples/font/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Font Example" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/handlers/pyproject.toml b/examples/handlers/pyproject.toml index 2f260d4c83..12b0ee41e5 100644 --- a/examples/handlers/pyproject.toml +++ b/examples/handlers/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Handler Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/imageview/pyproject.toml b/examples/imageview/pyproject.toml index 3fc44e44cc..dd75f1bec3 100644 --- a/examples/imageview/pyproject.toml +++ b/examples/imageview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ImageView Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/layout/pyproject.toml b/examples/layout/pyproject.toml index e7b22f9406..a05c152c37 100644 --- a/examples/layout/pyproject.toml +++ b/examples/layout/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Layout Test" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/multilinetextinput/pyproject.toml b/examples/multilinetextinput/pyproject.toml index e2a47bf039..34e6efaa49 100644 --- a/examples/multilinetextinput/pyproject.toml +++ b/examples/multilinetextinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "MultilineTextInput Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/numberinput/pyproject.toml b/examples/numberinput/pyproject.toml index 64c2677e4d..739c4159d9 100644 --- a/examples/numberinput/pyproject.toml +++ b/examples/numberinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Demo NumberInput" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/optioncontainer/pyproject.toml b/examples/optioncontainer/pyproject.toml index 50707dd726..b5d1f809c5 100644 --- a/examples/optioncontainer/pyproject.toml +++ b/examples/optioncontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Option Container Example" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-django/pyproject.toml b/examples/positron-django/pyproject.toml index 256ccf26ba..fb6318bdcb 100644 --- a/examples/positron-django/pyproject.toml +++ b/examples/positron-django/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/positron-static/pyproject.toml b/examples/positron-static/pyproject.toml index a6f0787890..5ee0388fd5 100644 --- a/examples/positron-static/pyproject.toml +++ b/examples/positron-static/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Positron" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/progressbar/pyproject.toml b/examples/progressbar/pyproject.toml index c202233651..3b321c1dd8 100644 --- a/examples/progressbar/pyproject.toml +++ b/examples/progressbar/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ProgressBar demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/scrollcontainer/pyproject.toml b/examples/scrollcontainer/pyproject.toml index a69145b040..0ab52b3373 100644 --- a/examples/scrollcontainer/pyproject.toml +++ b/examples/scrollcontainer/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "ScrollContainer Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/selection/pyproject.toml b/examples/selection/pyproject.toml index a0f3eed800..2b9417afe5 100644 --- a/examples/selection/pyproject.toml +++ b/examples/selection/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Selection Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/slider/pyproject.toml b/examples/slider/pyproject.toml index 2ae6cc7c9f..73bd6c1185 100644 --- a/examples/slider/pyproject.toml +++ b/examples/slider/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Slider Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/switch_demo/pyproject.toml b/examples/switch_demo/pyproject.toml index 925924e689..4865c6839a 100644 --- a/examples/switch_demo/pyproject.toml +++ b/examples/switch_demo/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Switch Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table/pyproject.toml b/examples/table/pyproject.toml index d630ab4625..9a36c732b5 100644 --- a/examples/table/pyproject.toml +++ b/examples/table/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Table Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/table_source/pyproject.toml b/examples/table_source/pyproject.toml index 4ca4841e20..ad385e396b 100644 --- a/examples/table_source/pyproject.toml +++ b/examples/table_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TableSource Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/textinput/pyproject.toml b/examples/textinput/pyproject.toml index dc74650c51..f2ba08464f 100644 --- a/examples/textinput/pyproject.toml +++ b/examples/textinput/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Text Input Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree/pyproject.toml b/examples/tree/pyproject.toml index 3efffe07c8..e362bb5d2b 100644 --- a/examples/tree/pyproject.toml +++ b/examples/tree/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tree Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tree_source/pyproject.toml b/examples/tree_source/pyproject.toml index eb2fef8510..c5ac305819 100644 --- a/examples/tree_source/pyproject.toml +++ b/examples/tree_source/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "TreeSource Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial0/pyproject.toml b/examples/tutorial0/pyproject.toml index b49e24a713..c9fa066741 100644 --- a/examples/tutorial0/pyproject.toml +++ b/examples/tutorial0/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 0" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial1/pyproject.toml b/examples/tutorial1/pyproject.toml index 07037c135d..d7d99a6186 100644 --- a/examples/tutorial1/pyproject.toml +++ b/examples/tutorial1/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 1" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial2/pyproject.toml b/examples/tutorial2/pyproject.toml index 80a322efd3..e160de7821 100644 --- a/examples/tutorial2/pyproject.toml +++ b/examples/tutorial2/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 2" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial3/pyproject.toml b/examples/tutorial3/pyproject.toml index 54aa5bf0da..57a34f933d 100644 --- a/examples/tutorial3/pyproject.toml +++ b/examples/tutorial3/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 3" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/tutorial4/pyproject.toml b/examples/tutorial4/pyproject.toml index ef3c73506f..308f8d7f87 100644 --- a/examples/tutorial4/pyproject.toml +++ b/examples/tutorial4/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Tutorial 4" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/webview/pyproject.toml b/examples/webview/pyproject.toml index 757abefd7e..b00e4221c5 100644 --- a/examples/webview/pyproject.toml +++ b/examples/webview/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "WebView Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/examples/window/pyproject.toml b/examples/window/pyproject.toml index f1c277f1fa..4c25312d3b 100644 --- a/examples/window/pyproject.toml +++ b/examples/window/pyproject.toml @@ -4,7 +4,7 @@ requires = ["briefcase"] [tool.briefcase] project_name = "Window Demo" bundle = "org.beeware" -version = "0.0.1rc6" +version = "0.3.0.dev39" url = "https://beeware.org" license = "BSD license" author = 'Tiberius Yak' diff --git a/src/android/src/toga_android/__init__.py b/src/android/src/toga_android/__init__.py index e94d8ec033..d400fada11 100644 --- a/src/android/src/toga_android/__init__.py +++ b/src/android/src/toga_android/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39' diff --git a/src/cocoa/src/toga_cocoa/__init__.py b/src/cocoa/src/toga_cocoa/__init__.py index e94d8ec033..d400fada11 100644 --- a/src/cocoa/src/toga_cocoa/__init__.py +++ b/src/cocoa/src/toga_cocoa/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39' diff --git a/src/core/src/toga/__init__.py b/src/core/src/toga/__init__.py index c6faaa6cda..d3638278cc 100644 --- a/src/core/src/toga/__init__.py +++ b/src/core/src/toga/__init__.py @@ -88,4 +88,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39' diff --git a/src/dummy/src/toga_dummy/__init__.py b/src/dummy/src/toga_dummy/__init__.py index f5c188b614..ba7582d45c 100644 --- a/src/dummy/src/toga_dummy/__init__.py +++ b/src/dummy/src/toga_dummy/__init__.py @@ -8,4 +8,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39' diff --git a/src/gtk/src/toga_gtk/__init__.py b/src/gtk/src/toga_gtk/__init__.py index e94d8ec033..d400fada11 100644 --- a/src/gtk/src/toga_gtk/__init__.py +++ b/src/gtk/src/toga_gtk/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39' diff --git a/src/iOS/src/toga_iOS/__init__.py b/src/iOS/src/toga_iOS/__init__.py index e94d8ec033..d400fada11 100644 --- a/src/iOS/src/toga_iOS/__init__.py +++ b/src/iOS/src/toga_iOS/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39' diff --git a/src/web/src/toga_web/__init__.py b/src/web/src/toga_web/__init__.py index e94d8ec033..d400fada11 100644 --- a/src/web/src/toga_web/__init__.py +++ b/src/web/src/toga_web/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39' diff --git a/src/winforms/src/toga_winforms/__init__.py b/src/winforms/src/toga_winforms/__init__.py index e94d8ec033..d400fada11 100644 --- a/src/winforms/src/toga_winforms/__init__.py +++ b/src/winforms/src/toga_winforms/__init__.py @@ -6,4 +6,4 @@ # __version__ = '1.2.3' # Final Release # __version__ = '1.2.3.post1' # Post Release 1 -__version__ = '0.0.1rc6' +__version__ = '0.3.0.dev39'