From 754b5c8f7b1ec46048f082c9cbdccfc6ec098dc5 Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 7 Feb 2024 12:17:29 +0200 Subject: [PATCH 1/6] Update license years --- LICENSE | 2 +- porcupine/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index b044b089b..eabe4269e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2023 Akuli +Copyright (c) 2017-2024 Akuli Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/porcupine/__init__.py b/porcupine/__init__.py index f2f4b1e44..6c7fa7c93 100644 --- a/porcupine/__init__.py +++ b/porcupine/__init__.py @@ -15,7 +15,7 @@ version_info = (2023, 6, 27) # this is updated with scripts/release.py __version__ = "%d.%02d.%02d" % version_info __author__ = "Akuli" -__copyright__ = "Copyright (c) 2017-2023 Akuli" +__copyright__ = "Copyright (c) 2017-2024 Akuli" __license__ = "MIT" if sys.platform in {"win32", "darwin"}: From fe06f0c097c28c658bd6959d6f5ea93d25e5a16b Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 7 Feb 2024 12:18:23 +0200 Subject: [PATCH 2/6] disable docs --- .github/workflows/release-builds.yml | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-builds.yml b/.github/workflows/release-builds.yml index 880c5b6d1..201327de1 100644 --- a/.github/workflows/release-builds.yml +++ b/.github/workflows/release-builds.yml @@ -25,22 +25,23 @@ jobs: name: windows-exe path: build/PorcupineSetup_*.exe - docs: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v4 - with: - python-version: "3.11" - cache: pip - - run: pip install wheel - - run: pip install -r requirements-dev.txt - - run: python3 -m sphinx ./docs ./build - - if: startsWith(github.ref, 'refs/tags/v') - uses: JamesIves/github-pages-deploy-action@4.1.3 - with: - branch: gh-pages - folder: build + # TODO: enable docs again? don't know why broken + #docs: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # - uses: actions/setup-python@v4 + # with: + # python-version: "3.11" + # cache: pip + # - run: pip install wheel + # - run: pip install -r requirements-dev.txt + # - run: python3 -m sphinx ./docs ./build + # - if: startsWith(github.ref, 'refs/tags/v') + # uses: JamesIves/github-pages-deploy-action@4.1.3 + # with: + # branch: gh-pages + # folder: build changelog: runs-on: ubuntu-latest From c7666d2e0539617047a279f161163801137bf4a8 Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 7 Feb 2024 10:25:37 +0000 Subject: [PATCH 3/6] Run pycln, pyupgrade, black and isort --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d50e40434..b7eaa8d57 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,7 +14,7 @@ send2trash>=1.8.0,<2.0.0 psutil>=5.8.0,<6.0.0 PyYAML==6.0 tree-sitter-builds==2023.3.12 -sv-ttk>=2.5.5 +sv-ttk==2.5.5 pytest==6.2.5 pytest-cov==4.0.0 pytest-mock==3.10.0 From 090adb62f95b279633d0c4df2aa5636aadb9640f Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 7 Feb 2024 12:25:43 +0200 Subject: [PATCH 4/6] pin sv-ttk --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index eab4a5e6a..1ee313d42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,8 @@ dependencies = [ "psutil>=5.8.0,<6.0.0", "PyYAML==6.0", "tree-sitter-builds==2023.3.12", - "sv-ttk>=2.5.5", + # TODO: upgrade sv-ttk + "sv-ttk==2.5.5", ] [project.optional-dependencies] From bf378a77b65a9a66d2a343d2be5cc5578299638e Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 7 Feb 2024 13:10:05 +0200 Subject: [PATCH 5/6] Delete dumb test --- tests/test_porcupine_files.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/tests/test_porcupine_files.py b/tests/test_porcupine_files.py index 8d4ff3d53..0d000776d 100644 --- a/tests/test_porcupine_files.py +++ b/tests/test_porcupine_files.py @@ -15,24 +15,3 @@ def test_license_file(): def test_copyright(): assert str(datetime.datetime.now().year) in porcupine.__copyright__ - - -# Porcupine dependencies are specified in pyproject.toml, but also kept in -# requirements-dev.txt for a convenient and familiar workflow. You just -# "pip install -r requirements-dev.txt" when you start developing Porcupine. -def test_requirements_and_pyproject_toml_in_sync(): - reqs_dev_content = [] - with open("requirements-dev.txt") as file: - for line in file: - requirement = line.split("#")[0].strip() - if requirement: - reqs_dev_content.append(requirement) - - with open("pyproject.toml", "rb") as file: - toml_content = tomli.load(file) - - assert ( - toml_content["project"]["dependencies"] - + toml_content["project"]["optional-dependencies"]["dev"] - == reqs_dev_content - ) From 8d979d6e4d92f2e19edcdee4c19b83b4e613f22c Mon Sep 17 00:00:00 2001 From: Akuli Date: Wed, 7 Feb 2024 11:09:56 +0000 Subject: [PATCH 6/6] Run pycln, pyupgrade, black and isort --- tests/test_porcupine_files.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_porcupine_files.py b/tests/test_porcupine_files.py index 0d000776d..cc8fead3a 100644 --- a/tests/test_porcupine_files.py +++ b/tests/test_porcupine_files.py @@ -1,8 +1,6 @@ import datetime from pathlib import Path -import tomli - import porcupine