From d86339aaa8fe00ee1305a2f658b84f69979325e7 Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Wed, 22 Feb 2023 15:07:27 +1100 Subject: [PATCH 1/2] PEP621 pyproject.toml --- pyproject.toml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 89fb8c2b..736f11a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,11 +2,12 @@ requires = ["flit_core>=2,<4"] build-backend = "flit_core.buildapi" -[tool.flit.metadata] -module = "wily" -author = "Anthony Shaw" -author-email = "anthonyshaw@apache.org" -home-page = "https://github.com/tonybaloney/wily" +[project] +name = "wily" +authors = [ + { name = "Anthony Shaw", email = "anthonyshaw@apache.org"}, +] +readme = "README.md" classifiers = [ "License :: OSI Approved :: Apache Software License", "Development Status :: 5 - Production/Stable", @@ -19,7 +20,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3 :: Only", ] -requires = [ +dependencies = [ "gitpython>=3.0.0,<4.0.0", "radon>=5.1,<5.2", "click>=7.0,<9.0", @@ -31,9 +32,9 @@ requires = [ "dataclasses; python_version == '3.6'", ] requires-python = ">=3.6" -description-file = "README.md" +dynamic=["version", "description"] -[tool.flit.metadata.requires-extra] +[project.optional-dependencies] test = [ "pytest~=7.2", "pytest-cov~=3.0.0", @@ -55,16 +56,17 @@ dev = [ # TODO: move here proper deps from `docs/requirements_docs.txt` doc = [] -[tool.flit.metadata.urls] +[project.urls] +Homepage = "https://github.com/tonybaloney/wily" Documentation = "https://wily.readthedocs.io/en/latest/" +[project.scripts] +wily = "wily.__main__:cli" + [tool.flit.sdist] include = ["doc/"] exclude = ["doc/*.html"] -[tool.flit.scripts] -wily = "wily.__main__:cli" - [tool.black] line-length = 88 target-version = ["py37", "py38", "py39", "py310", "py311"] From 3643429c4186c17f96bf9350f525336ee8a279cf Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Thu, 23 Feb 2023 11:08:56 +1100 Subject: [PATCH 2/2] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b17fffbe..e69f28ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,8 @@ jobs: python-version: "${{ matrix.python-version }}" - name: install dependencies run: | - python -m pip install -U pip - pip install wheel flit + python -m pip install -U pip setuptools wheel + pip install flit flit install --extras=all - name: lint and test run: make ci