From e8dcff5a40244372891bdfefea94be2d73df4206 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 13:40:28 -0500 Subject: [PATCH 01/37] Update libraries --- pyproject.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4a34e0375..ed6bdee19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,8 +22,8 @@ classifiers = [ ] dependencies = [ "pyglet>=2.0.8,<2.1", - "pillow~=9.5.0", - "pymunk~=6.5.0", + "pillow~=10.0.0", + "pymunk~=6.5.1", "pytiled-parser~=2.2.3" ] dynamic = ["version"] @@ -45,16 +45,16 @@ dev = [ "coveralls", "pytest-mock", "pytest-cov", - "pygments==2.15.1", - "docutils==0.19", + "pygments==2.16.1", + "docutils==0.20.1", "furo", "pyright==1.1.322", "pyyaml==6.0", - "sphinx==7.1.2", + "sphinx==7.2.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 - "sphinx-sitemap==2.3.0", + "sphinx-sitemap==2.5.1", "typer[all]==0.7.0", "wheel", ] From b2e6b8f57fcec7e4225bc3f3286eff4f5c368b71 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 13:50:50 -0500 Subject: [PATCH 02/37] Drop Python 3.8 support --- .github/workflows/test.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc583c5da..12980abff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11'] architecture: ['x64'] steps: diff --git a/pyproject.toml b/pyproject.toml index ed6bdee19..a59dba703 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = [ {name="Paul Vincent Craven", email="paul@cravenfamily.com"} ] license = {file = "license.rst"} -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", From c216355e6dc16f9a77924373f1774c0a0b6610ea Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 14:04:57 -0500 Subject: [PATCH 03/37] Try running 3.11 and 3.10 on self-hosted runner --- .github/workflows/selfhosted_runner.yml | 9 ++++++++- .github/workflows/test.yml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index ec4324977..28caf1751 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -12,12 +12,19 @@ jobs: build: name: Self Hosted Testing runs-on: self-hosted + + strategy: + matrix: + os: [ubuntu-latest] + python-version: ['3.10', '3.11'] + architecture: ['x64'] + steps: - uses: actions/checkout@v3 - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: ${{ matrix.python-version }} - name: Install dependencies part 1 run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12980abff..9a71610b9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: - name: build-docs run: | sphinx-build doc build -W - # Prepare the Pull Request Payload artifact. If this fails, we + # Prepare the Pull Request Payload artifact. If this fails, # we fail silently using the `continue-on-error` option. It's # nice if this succeeds, but if it fails for any reason, it # does not mean that our lint-test checks failed. From 913df2c84e44e12d0bbb70efb0a0bd286de7e2e2 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 14:17:22 -0500 Subject: [PATCH 04/37] Have self-hosted run on different python versions, and just build docs on 3.11. --- .github/workflows/selfhosted_runner.yml | 4 ++-- .github/workflows/test.yml | 4 +++- pyproject.toml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 28caf1751..4d97e18cb 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -1,3 +1,4 @@ +# This is our full unit tests name: Windows self-hosted test on: @@ -16,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11'] architecture: ['x64'] steps: @@ -32,7 +33,6 @@ jobs: python -m venv .venv source .venv/bin/activate python -m pip install -U pip wheel setuptools - python -m pip install pyogg pymunk - name: Install dependencies part 2 run: | source .venv/bin/activate diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a71610b9..aaead57c2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,3 +1,5 @@ +# This mainly tests to make sure the build docs work + name: GitHub Ubuntu test on: @@ -16,7 +18,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.9', '3.10', '3.11'] + python-version: ['3.11'] architecture: ['x64'] steps: diff --git a/pyproject.toml b/pyproject.toml index a59dba703..ed6bdee19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = [ {name="Paul Vincent Craven", email="paul@cravenfamily.com"} ] license = {file = "license.rst"} -requires-python = ">=3.9" +requires-python = ">=3.8" classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", From 0908cb68f6c628e4afd586f819941fa552f97512 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 14:59:01 -0500 Subject: [PATCH 05/37] Just install dependencies when testing --- .github/workflows/selfhosted_runner.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 4d97e18cb..233ca476d 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -36,7 +36,8 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - python -m pip install -I -e .[dev] + python -m pip install -I -e .[dependencies] + python -m pip install pytest - name: code-inspection run: | source .venv/bin/activate From 3629802db8ebd917cdc5aa7eda703f6cb2686c64 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 15:23:34 -0500 Subject: [PATCH 06/37] Try with typer --- .github/workflows/selfhosted_runner.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 233ca476d..205baefa5 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -37,7 +37,7 @@ jobs: run: | source .venv/bin/activate python -m pip install -I -e .[dependencies] - python -m pip install pytest + python -m pip install pytest typer[all]==0.7.0 - name: code-inspection run: | source .venv/bin/activate diff --git a/pyproject.toml b/pyproject.toml index ed6bdee19..8fd42fb71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ dev = [ "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 - "sphinx-sitemap==2.5.1", + "sphinx-sitemap==2.3.0", "typer[all]==0.7.0", "wheel", ] From 18452f70a20454b541acad5eb6d3609d3301297b Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 15:44:30 -0500 Subject: [PATCH 07/37] Revert --- .github/workflows/selfhosted_runner.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 205baefa5..4d97e18cb 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -36,8 +36,7 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - python -m pip install -I -e .[dependencies] - python -m pip install pytest typer[all]==0.7.0 + python -m pip install -I -e .[dev] - name: code-inspection run: | source .venv/bin/activate From ec1f493eaa6413804692c19047fde545178fe535 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 15:50:27 -0500 Subject: [PATCH 08/37] Remove build docs test --- .github/workflows/selfhosted_runner.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 4d97e18cb..06da24e4f 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -42,10 +42,6 @@ jobs: source .venv/bin/activate mypy arcade ruff arcade - - name: build-docs - run: | - source .venv/bin/activate - sphinx-build doc build -W - name: Test with pytest run: | source .venv/bin/activate From f63efb862fb908b4e880eafdb5b23ae72fc560eb Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 16:00:54 -0500 Subject: [PATCH 09/37] Update --- .github/workflows/selfhosted_runner.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 06da24e4f..8d740b3e2 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -36,12 +36,7 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - python -m pip install -I -e .[dev] - - name: code-inspection - run: | - source .venv/bin/activate - mypy arcade - ruff arcade + python -m pip install -I -e .[dependencies] - name: Test with pytest run: | source .venv/bin/activate From 423edcef7cced624bd57fc4cda68e6d85c35982a Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 16:03:31 -0500 Subject: [PATCH 10/37] Update --- .github/workflows/selfhosted_runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 8d740b3e2..ecf244c07 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - python -m pip install -I -e .[dependencies] + # python -m pip install -I -e .[dev] - name: Test with pytest run: | source .venv/bin/activate From 19aadde887bf0e7d90e321d4a15d82539b67c772 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 16:13:00 -0500 Subject: [PATCH 11/37] Update --- .github/workflows/selfhosted_runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index ecf244c07..e8d998370 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - # python -m pip install -I -e .[dev] + python -m pip install -I -e . - name: Test with pytest run: | source .venv/bin/activate From 9b31a03fcd2b73f3162435d7da5cf1b814860d74 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 16:19:47 -0500 Subject: [PATCH 12/37] Update --- .github/workflows/selfhosted_runner.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index e8d998370..0525d4ef4 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: [3.9', '3.10', '3.11'] architecture: ['x64'] steps: @@ -36,7 +36,7 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - python -m pip install -I -e . + python -m pip install -I -e .[dev] - name: Test with pytest run: | source .venv/bin/activate From 36c109718f5d902d642f82a2e2dbbd4fcf2f1216 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 16:32:06 -0500 Subject: [PATCH 13/37] Update --- .github/workflows/selfhosted_runner.yml | 2 +- .github/workflows/test.yml | 2 +- pyproject.toml | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 0525d4ef4..654f30588 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - python -m pip install -I -e .[dev] + python -m pip install -I -e .[dev2] - name: Test with pytest run: | source .venv/bin/activate diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aaead57c2..6d7b172d9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -# This mainly tests to make sure the build docs work +# This does code inspection and checks to make sure building of docs works name: GitHub Ubuntu test diff --git a/pyproject.toml b/pyproject.toml index 8fd42fb71..e4adfab7f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,6 +58,27 @@ dev = [ "typer[all]==0.7.0", "wheel", ] +dev2 = [ + "pytest", + "mypy", + "ruff", + "coverage", + "coveralls", + "pytest-mock", + "pytest-cov", + "pygments==2.16.1", + "docutils==0.20.1", + "furo", + "pyright==1.1.322", + "pyyaml==6.0", + "sphinx==7.2.2", + "sphinx-autobuild==2021.3.14", + "sphinx-copybutton==0.5.2", + # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 + "sphinx-sitemap==2.3.0", + "typer[all]==0.7.0", + "wheel", +] [project.scripts] arcade = "arcade.management:execute_from_command_line" From 4c8c143a07b82cc41dbac7417be7a02426069f9e Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 16:51:32 -0500 Subject: [PATCH 14/37] Update --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e4adfab7f..5cdc8f3ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,11 +67,11 @@ dev2 = [ "pytest-mock", "pytest-cov", "pygments==2.16.1", - "docutils==0.20.1", + "docutils==0.19", "furo", "pyright==1.1.322", "pyyaml==6.0", - "sphinx==7.2.2", + "sphinx==7.1.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 From c1da7cb465ea0d2a064905423279cc25aaac7951 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 17:09:59 -0500 Subject: [PATCH 15/37] Update --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5cdc8f3ea..2ef659897 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,8 +45,8 @@ dev = [ "coveralls", "pytest-mock", "pytest-cov", - "pygments==2.16.1", - "docutils==0.20.1", + "pygments==2.15", + "docutils==0.19", "furo", "pyright==1.1.322", "pyyaml==6.0", @@ -66,7 +66,7 @@ dev2 = [ "coveralls", "pytest-mock", "pytest-cov", - "pygments==2.16.1", + "pygments==2.15", "docutils==0.19", "furo", "pyright==1.1.322", From 1b75ba5e1a0bf4a6ce9d7253c5622967b14be283 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 17:19:41 -0500 Subject: [PATCH 16/37] Update --- .github/workflows/selfhosted_runner.yml | 2 +- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 654f30588..c38cdf425 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.9', '3.10', '3.11'] + python-version: ['3.9.13', '3.10', '3.11'] architecture: ['x64'] steps: diff --git a/pyproject.toml b/pyproject.toml index 2ef659897..0f5c7fba0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ dev = [ "coveralls", "pytest-mock", "pytest-cov", - "pygments==2.15", + "pygments==2.15.1", "docutils==0.19", "furo", "pyright==1.1.322", @@ -66,7 +66,7 @@ dev2 = [ "coveralls", "pytest-mock", "pytest-cov", - "pygments==2.15", + "pygments==2.15.1", "docutils==0.19", "furo", "pyright==1.1.322", From 10b7a85b87dc0d611772a9e3a838115ae1f2938f Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 18:04:33 -0500 Subject: [PATCH 17/37] Update --- pyproject.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0f5c7fba0..283706be4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ dev = [ "furo", "pyright==1.1.322", "pyyaml==6.0", - "sphinx==7.2.2", + "sphinx==7.1.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 @@ -60,10 +60,6 @@ dev = [ ] dev2 = [ "pytest", - "mypy", - "ruff", - "coverage", - "coveralls", "pytest-mock", "pytest-cov", "pygments==2.15.1", From ddca3a1fab7efaa620e762b0d3b01ed20cc77379 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 19:12:48 -0500 Subject: [PATCH 18/37] Update --- pyproject.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 283706be4..ace7db565 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,14 +64,8 @@ dev2 = [ "pytest-cov", "pygments==2.15.1", "docutils==0.19", - "furo", "pyright==1.1.322", "pyyaml==6.0", - "sphinx==7.1.2", - "sphinx-autobuild==2021.3.14", - "sphinx-copybutton==0.5.2", - # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 - "sphinx-sitemap==2.3.0", "typer[all]==0.7.0", "wheel", ] From db715984345e19426d43335b1c75dfd89cf88ff6 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 19:19:31 -0500 Subject: [PATCH 19/37] Update --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ace7db565..c41ae586c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,9 +62,6 @@ dev2 = [ "pytest", "pytest-mock", "pytest-cov", - "pygments==2.15.1", - "docutils==0.19", - "pyright==1.1.322", "pyyaml==6.0", "typer[all]==0.7.0", "wheel", From a7b98b70357e320ea52dc29147d80a121deee4a0 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 19:33:28 -0500 Subject: [PATCH 20/37] Update --- pyproject.toml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c41ae586c..4ccac5e75 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,12 +45,12 @@ dev = [ "coveralls", "pytest-mock", "pytest-cov", - "pygments==2.15.1", - "docutils==0.19", + "pygments==2.16.1", + "docutils==0.20.1", "furo", "pyright==1.1.322", - "pyyaml==6.0", - "sphinx==7.1.2", + "pyyaml==6.0.1", + "sphinx==7.2.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 @@ -62,8 +62,6 @@ dev2 = [ "pytest", "pytest-mock", "pytest-cov", - "pyyaml==6.0", - "typer[all]==0.7.0", "wheel", ] From e101ddb5c16c62a22662cfb67db672aa4e42262f Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 19:38:08 -0500 Subject: [PATCH 21/37] Update --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4ccac5e75..a3d2b3c38 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,7 @@ Source = "https://github.com/pythonarcade/arcade" Book = "https://learn.arcade.academy" [project.optional-dependencies] +# Used for dev work dev = [ "pytest", "mypy", @@ -46,7 +47,7 @@ dev = [ "pytest-mock", "pytest-cov", "pygments==2.16.1", - "docutils==0.20.1", + "docutils==0.19", "furo", "pyright==1.1.322", "pyyaml==6.0.1", @@ -58,11 +59,11 @@ dev = [ "typer[all]==0.7.0", "wheel", ] +# Testing only dev2 = [ "pytest", "pytest-mock", "pytest-cov", - "wheel", ] [project.scripts] From bffadaca571274768ee3641bcd4e6859aeb53237 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 19:47:41 -0500 Subject: [PATCH 22/37] Update --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index a3d2b3c38..e0e8c6900 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,6 +64,7 @@ dev2 = [ "pytest", "pytest-mock", "pytest-cov", + "typer[all]==0.7.0", ] [project.scripts] From 96f1144f906e45f031541ea77726460d98f7ed3e Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 19:53:03 -0500 Subject: [PATCH 23/37] Update --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e0e8c6900..47ddb69ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,8 +50,8 @@ dev = [ "docutils==0.19", "furo", "pyright==1.1.322", - "pyyaml==6.0.1", - "sphinx==7.2.2", + "pyyaml==6.0", + "sphinx==7.1.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 @@ -64,7 +64,9 @@ dev2 = [ "pytest", "pytest-mock", "pytest-cov", + "pyyaml==6.0", "typer[all]==0.7.0", + "wheel", ] [project.scripts] From 0f3a7fd8f067ad166d87aa418607913c98f3d6a5 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sat, 19 Aug 2023 20:18:34 -0500 Subject: [PATCH 24/37] Update --- .github/workflows/selfhosted_runner.yml | 2 +- pyproject.toml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index c38cdf425..30b432ffd 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -36,7 +36,7 @@ jobs: - name: Install dependencies part 2 run: | source .venv/bin/activate - python -m pip install -I -e .[dev2] + python -m pip install -I -e .[testing_libraries] - name: Test with pytest run: | source .venv/bin/activate diff --git a/pyproject.toml b/pyproject.toml index 47ddb69ed..11c8e8a9f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ dev = [ "docutils==0.19", "furo", "pyright==1.1.322", - "pyyaml==6.0", + "pyyaml==6.0.1", "sphinx==7.1.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", @@ -60,13 +60,12 @@ dev = [ "wheel", ] # Testing only -dev2 = [ +testing_libraries = [ "pytest", "pytest-mock", "pytest-cov", - "pyyaml==6.0", + "pyyaml==6.0.1", "typer[all]==0.7.0", - "wheel", ] [project.scripts] From 571253dfacd84736dfe74075a2ac29aba5956d2c Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 08:46:59 -0500 Subject: [PATCH 25/37] Update --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 11c8e8a9f..5d6cc2a88 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ dev = [ "furo", "pyright==1.1.322", "pyyaml==6.0.1", - "sphinx==7.1.2", + "sphinx==7.2.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 From 135d8817d8bdf1e2d7a701b7406d4f6cd4f3692f Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 08:52:26 -0500 Subject: [PATCH 26/37] Update --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5d6cc2a88..1bed04520 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,8 +54,7 @@ dev = [ "sphinx==7.2.2", "sphinx-autobuild==2021.3.14", "sphinx-copybutton==0.5.2", - # Intentionally kept at 2.3 until this bugfix is published: https://github.com/jdillard/sphinx-sitemap/pull/62 - "sphinx-sitemap==2.3.0", + "sphinx-sitemap==2.5.1", "typer[all]==0.7.0", "wheel", ] From 969515ca901b234ba132665e4f45b9e42c3ed4a2 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 09:09:41 -0500 Subject: [PATCH 27/37] Update --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1bed04520..79f414bb8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ dev = [ "pytest-mock", "pytest-cov", "pygments==2.16.1", - "docutils==0.19", + "docutils==0.20.1", "furo", "pyright==1.1.322", "pyyaml==6.0.1", From d180c8683efc7ab4fbe598cbf79129eb1df00ae9 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 09:11:18 -0500 Subject: [PATCH 28/37] Update --- .github/workflows/selfhosted_runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 30b432ffd..f1adcfeb7 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.9.13', '3.10', '3.11'] + python-version: ['3.8', '3.9.13', '3.10', '3.11'] architecture: ['x64'] steps: From 2bcb3a136104c5748b71dd6a1e0dfc95d313a3b9 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 09:35:19 -0500 Subject: [PATCH 29/37] Update --- .github/workflows/selfhosted_runner.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index f1adcfeb7..a108420ea 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -62,7 +62,7 @@ jobs: - name: Upload a Build Artifact if: always() && steps.prepare-artifact.outcome == 'success' continue-on-error: true - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: pull-request-payload path: pull_request_payload.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d7b172d9..e97d72350 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,7 @@ jobs: - name: Upload a Build Artifact if: always() && steps.prepare-artifact.outcome == 'success' continue-on-error: true - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: pull-request-payload path: pull_request_payload.json From dda15cee1f4da0e009bf09bb2308648e53db930e Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 09:47:03 -0500 Subject: [PATCH 30/37] Remove Python 3.8 incompatible typing --- .github/workflows/selfhosted_runner.yml | 5 +++-- .github/workflows/test.yml | 2 +- doc/tutorials/menu/menu_05.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index a108420ea..69ca0e8b2 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -1,5 +1,6 @@ # This is our full unit tests -name: Windows self-hosted test +# Self-hosted, run on an old notebook +name: Unit tests on: push: @@ -11,7 +12,7 @@ on: jobs: build: - name: Self Hosted Testing + name: Unit Testing runs-on: self-hosted strategy: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e97d72350..802f05eeb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ # This does code inspection and checks to make sure building of docs works -name: GitHub Ubuntu test +name: GitHub action tests on: push: diff --git a/doc/tutorials/menu/menu_05.py b/doc/tutorials/menu/menu_05.py index d5c5ba6dc..ad5376eba 100644 --- a/doc/tutorials/menu/menu_05.py +++ b/doc/tutorials/menu/menu_05.py @@ -155,7 +155,7 @@ def on_draw(self): class SubMenu(arcade.gui.UIMouseFilterMixin, arcade.gui.UIAnchorLayout): """Acts like a fake view/window.""" - def __init__(self, title: str, input_text: str, toggle_label: str, dropdown_options: list[str], slider_label: str): + def __init__(self, title: str, input_text: str, toggle_label: str, dropdown_options: list, slider_label: str): super().__init__(size_hint=(1, 1)) # Setup frame which will act like the window. From fdc3abf86c8074a67a610f62e413eef92c62ce96 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 09:58:55 -0500 Subject: [PATCH 31/37] Update --- .github/workflows/selfhosted_runner.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- util/make_resources_init.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/selfhosted_runner.yml b/.github/workflows/selfhosted_runner.yml index 69ca0e8b2..b57262f51 100644 --- a/.github/workflows/selfhosted_runner.yml +++ b/.github/workflows/selfhosted_runner.yml @@ -1,6 +1,6 @@ # This is our full unit tests # Self-hosted, run on an old notebook -name: Unit tests +name: Unit testing on: push: @@ -12,7 +12,7 @@ on: jobs: build: - name: Unit Testing + name: Unit tests runs-on: self-hosted strategy: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 802f05eeb..da9bc8e99 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ # This does code inspection and checks to make sure building of docs works -name: GitHub action tests +name: Code inspections on: push: @@ -12,7 +12,7 @@ on: jobs: build: - name: test + name: Code inspections runs-on: ${{ matrix.os }} strategy: diff --git a/util/make_resources_init.py b/util/make_resources_init.py index f33eec918..ffaf61245 100644 --- a/util/make_resources_init.py +++ b/util/make_resources_init.py @@ -82,7 +82,8 @@ def get_prefix(path: Path) -> str: def is_path_ignored(path: Path) -> bool: """Return True if the path should be ignored.""" for ignore_path in IGNORE_PATHS: - if path.is_relative_to(ignore_path): + # if path.is_relative_to(ignore_path): # Python 3.9+ + if str(path).startswith(str(ignore_path)): return True return False From 6c282b923bcb87e0032517cbecd7f62a5606fb04 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 10:11:25 -0500 Subject: [PATCH 32/37] Update --- .github/workflows/verify_types.yml | 2 +- tests/unit/resources/test_resources.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify_types.yml b/.github/workflows/verify_types.yml index df229b8ea..f6de7b98b 100644 --- a/.github/workflows/verify_types.yml +++ b/.github/workflows/verify_types.yml @@ -10,7 +10,7 @@ on: jobs: verifytypes: - name: verifytypes + name: Verify types runs-on: ubuntu-latest steps: diff --git a/tests/unit/resources/test_resources.py b/tests/unit/resources/test_resources.py index 3ff4ba2aa..2b25cd090 100644 --- a/tests/unit/resources/test_resources.py +++ b/tests/unit/resources/test_resources.py @@ -45,7 +45,8 @@ def test_resource_listing_is_complete(): continue if path.suffix in skip_extensions: continue - if any(path.is_relative_to(skip_path) for skip_path in skip_paths): + if any(str(path).startswith(str(skip_path)) for skip_path in skip_paths): Python 3.9 + # if any(path.is_relative_to(skip_path) for skip_path in skip_paths): Python 3.9 continue paths_in_resources.add(path) From 77f3a300d09bdcbe2060a1781bead0770701606c Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 10:13:06 -0500 Subject: [PATCH 33/37] Update --- tests/unit/resources/test_resources.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/resources/test_resources.py b/tests/unit/resources/test_resources.py index 2b25cd090..acef0a2b3 100644 --- a/tests/unit/resources/test_resources.py +++ b/tests/unit/resources/test_resources.py @@ -45,8 +45,8 @@ def test_resource_listing_is_complete(): continue if path.suffix in skip_extensions: continue - if any(str(path).startswith(str(skip_path)) for skip_path in skip_paths): Python 3.9 - # if any(path.is_relative_to(skip_path) for skip_path in skip_paths): Python 3.9 + if any(str(path).startswith(str(skip_path)) for skip_path in skip_paths): + # if any(path.is_relative_to(skip_path) for skip_path in skip_paths): # Python 3.9+ continue paths_in_resources.add(path) From 930002fb81743f2cec97bb56f0e159be8461029f Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 10:20:05 -0500 Subject: [PATCH 34/37] Update --- .github/workflows/test.yml | 62 ++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da9bc8e99..21a7b1458 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,18 +36,56 @@ jobs: id: wheel run: | python -m pip install -e .[dev] - - name: "code-inspection: mypy" - if: ${{ (success() || failure()) && steps.wheel.outcome == 'success' }} - run: | - python ./make.py mypy - - name: "code-inspection: pyright" - if: ${{ (success() || failure()) && steps.wheel.outcome == 'success' }} - run: | - python ./make.py pyright - - name: "code-inspection: ruff" - if: ${{ (success() || failure()) && steps.wheel.outcome == 'success' }} - run: | - python ./make.py ruff + - name: build-docs + run: | + sphinx-build doc build -W + # Prepare the Pull Request Payload artifact. If this fails, + # we fail silently using the `continue-on-error` option. It's + # nice if this succeeds, but if it fails for any reason, it + # does not mean that our lint-test checks failed. + - name: Prepare Pull Request Payload artifact + id: prepare-artifact + if: always() && github.event_name == 'pull_request' + continue-on-error: true + run: cat $GITHUB_EVENT_PATH | jq '.pull_request' > pull_request_payload.json + + # This only makes sense if the previous step succeeded. To + # get the original outcome of the previous step before the + # `continue-on-error` conclusion is applied, we use the + # `.outcome` value. This step also fails silently. + - name: Upload a Build Artifact + if: always() && steps.prepare-artifact.outcome == 'success' + continue-on-error: true + uses: actions/upload-artifact@v3 + with: + name: pull-request-payload + path: pull_request_payload.json + + docbuild: + name: Test building documents + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ubuntu-latest] + python-version: ['3.11'] + architecture: ['x64'] + + steps: + - uses: actions/checkout@v3 + - name: setup + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + architecture: ${{ matrix.architecture }} + + - name: dependencies + run: | + python -m pip install -U pip wheel setuptools + - name: wheel + id: wheel + run: | + python -m pip install -e .[dev] - name: build-docs run: | sphinx-build doc build -W From 8333b12506172e39408cfb9618e075ea4105bc93 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 10:24:42 -0500 Subject: [PATCH 35/37] Update --- .github/workflows/test.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 21a7b1458..3904459fb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,6 +36,18 @@ jobs: id: wheel run: | python -m pip install -e .[dev] + - name: "code-inspection: mypy" + if: ${{ (success() || failure()) && steps.wheel.outcome == 'success' }} + run: | + python ./make.py mypy + - name: "code-inspection: pyright" + if: ${{ (success() || failure()) && steps.wheel.outcome == 'success' }} + run: | + python ./make.py pyright + - name: "code-inspection: ruff" + if: ${{ (success() || failure()) && steps.wheel.outcome == 'success' }} + run: | + python ./make.py ruff - name: build-docs run: | sphinx-build doc build -W @@ -61,8 +73,8 @@ jobs: name: pull-request-payload path: pull_request_payload.json - docbuild: - name: Test building documents + builddoc: + name: Documentation test runs-on: ${{ matrix.os }} strategy: From e22403db070fdcad1fbabda6ad5ee090b0848c5f Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 11:27:49 -0500 Subject: [PATCH 36/37] Update --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3904459fb..be08e57b3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ # This does code inspection and checks to make sure building of docs works -name: Code inspections +name: GitHub based tests on: push: @@ -48,9 +48,6 @@ jobs: if: ${{ (success() || failure()) && steps.wheel.outcome == 'success' }} run: | python ./make.py ruff - - name: build-docs - run: | - sphinx-build doc build -W # Prepare the Pull Request Payload artifact. If this fails, # we fail silently using the `continue-on-error` option. It's # nice if this succeeds, but if it fails for any reason, it @@ -74,7 +71,7 @@ jobs: path: pull_request_payload.json builddoc: - name: Documentation test + name: Documentation build test runs-on: ${{ matrix.os }} strategy: From 413249d59562f9f23a276cece5381a45f680e128 Mon Sep 17 00:00:00 2001 From: Paul Craven Date: Sun, 20 Aug 2023 11:30:17 -0500 Subject: [PATCH 37/37] Update --- doc/tutorials/menu/menu_05.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/tutorials/menu/menu_05.py b/doc/tutorials/menu/menu_05.py index ad5376eba..5917ec5eb 100644 --- a/doc/tutorials/menu/menu_05.py +++ b/doc/tutorials/menu/menu_05.py @@ -3,6 +3,8 @@ Shows the usage of almost every gui widget, switching views and making a modal. """ +from typing import List + import arcade import arcade.gui @@ -155,7 +157,7 @@ def on_draw(self): class SubMenu(arcade.gui.UIMouseFilterMixin, arcade.gui.UIAnchorLayout): """Acts like a fake view/window.""" - def __init__(self, title: str, input_text: str, toggle_label: str, dropdown_options: list, slider_label: str): + def __init__(self, title: str, input_text: str, toggle_label: str, dropdown_options: List[str], slider_label: str): super().__init__(size_hint=(1, 1)) # Setup frame which will act like the window.