Skip to content

Commit 379040b

Browse files
authored
Merge pull request #1052 from boriel-basic/build/update_project
Build/update project
2 parents 50060fc + 3f107f7 commit 379040b

3 files changed

Lines changed: 46 additions & 33 deletions

File tree

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will install Python dependencies, run tests and lint with a single version of Python
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
33

4-
name: ZXBasic
4+
name: Run Test
55

66
on:
77
pull_request:
@@ -29,8 +29,8 @@ jobs:
2929

3030
- name: Install poetry
3131
run: |
32-
pip install -U pip~=24.0
33-
pip install poetry~=1.7.1
32+
pip install -U pip~=26.0
33+
pip install poetry~=2.3.2
3434
poetry config virtualenvs.in-project true
3535
3636
- name: Set up poetry cache

poetry.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
1-
[tool.poetry]
1+
[project]
22
name = "zxbasic"
33
version = "1.18.7"
44
description = "Boriel's ZX BASIC Compiler"
5-
authors = ["Jose Rodriguez <zxbasic@boriel.com>"]
5+
authors = [
6+
{ name = "Jose Rodriguez", email = "zxbasic@boriel.com" }
7+
]
68
license = "AGPL-3.0-or-later"
7-
documentation = "https://zxbasic.readthedocs.io"
8-
repository = "https://github.com/boriel-basic/zxbasic"
9-
homepage = "https://github.com/boriel-basic"
9+
license-files = [
10+
"LICENSE.txt"
11+
]
1012
readme = "README.md"
11-
13+
requires-python = ">=3.11"
14+
keywords = ["compiler", "zxspectrum", "BASIC", "z80"]
1215
classifiers = [
13-
'Development Status :: 5 - Production/Stable',
14-
'Intended Audience :: Developers',
15-
'Topic :: Software Development :: Build Tools',
16-
'License :: OSI Approved :: GNU Affero General Public License v3',
17-
"Programming Language :: Python :: 3",
18-
"Programming Language :: Python :: 3.11",
19-
"Programming Language :: Python :: 3.12",
20-
"Programming Language :: Python :: 3.13",
21-
]
22-
23-
keywords = ['compiler', 'zxspectrum', 'BASIC', 'z80'] # arbitrary keywords
16+
"Development Status :: 5 - Production/Stable",
17+
"Intended Audience :: Developers",
18+
"Topic :: Software Development :: Build Tools",
19+
"Programming Language :: Python :: 3",
20+
"Programming Language :: Python :: 3.11",
21+
"Programming Language :: Python :: 3.12",
22+
"Programming Language :: Python :: 3.13",
23+
]
24+
25+
[project.urls]
26+
Homepage = "https://github.com/boriel-basic"
27+
Repository = "https://github.com/boriel-basic/zxbasic"
28+
Documentation = "https://zxbasic.readthedocs.io"
29+
30+
[project.scripts]
31+
zxbc = "src.zxbc:main"
32+
zxbasm = "src.zxbasm:main"
33+
zxbpp = "src.zxbpp:entry_point"
2434

35+
# Poetry-specific packaging configuration that is not part of PEP 621.
36+
# Keep this minimal section to preserve the current package discovery behavior.
37+
[tool.poetry]
2538
packages = [
2639
{ include = "src/**/*" }
2740
]
2841

29-
[tool.poetry.scripts]
30-
zxbc = 'src.zxbc:main'
31-
zxbasm = 'src.zxbasm:main'
32-
zxbpp = 'src.zxbpp:entry_point'
33-
34-
[tool.poetry.dependencies]
35-
python = ">=3.11"
36-
3742
[tool.poetry.group.dev.dependencies]
3843
pytest = "*"
3944
bump2version = "^1.0.0"
@@ -47,8 +52,8 @@ pytest-xdist = "*"
4752
setuptools = ">=70.1.1,<79.0.0"
4853

4954
[build-system]
50-
requires = ["poetry>=2.3.1"]
51-
build-backend = "poetry.masonry.api"
55+
requires = ["poetry-core>=2.0.0"]
56+
build-backend = "poetry.core.masonry.api"
5257

5358
[tool.poe.tasks]
5459
[[tool.poe.tasks.lint]]
@@ -74,6 +79,14 @@ shell = """
7479
ruff format .
7580
"""
7681

82+
[[tool.poe.tasks.clean]]
83+
help = "Clean up the project working tree (i.e. remove __pycache__ folders)"
84+
shell = """
85+
find . -name "__pycache__" | xargs rm -rf
86+
find . -name "*.pyc" -delete
87+
rm -rf .mypy_cache .pytest_cache .ruff_cache dist/ .coverage.*
88+
"""
89+
7790
[tool.coverage.run]
7891
branch = true
7992
omit = [

0 commit comments

Comments
 (0)