Skip to content

Commit 2fb8d2b

Browse files
authored
Update pyproject.toml for Poetry 2.0, adopting PEP 621 standards (FRINXio#119)
* Update pyproject.toml for Poetry 2.0, adopting PEP 621 standards * Update Poetry build-system requirements * Update actions-poetry to use Poetry 2.0.1 in GitHub workflows * Update release matrix
1 parent 7e971df commit 2fb8d2b

File tree

38 files changed

+707
-389
lines changed

38 files changed

+707
-389
lines changed

.github/workflows/pr-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
python-version: "3.10"
7070
- uses: abatilo/actions-poetry@v2
7171
with:
72-
poetry-version: "1.4.2"
72+
poetry-version: "2.0.1"
7373
- name: Install package dependencies.
7474
run: poetry install
7575
- name: Run mypy.

.github/workflows/pr-create.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454

5555
- uses: abatilo/actions-poetry@v2
5656
with:
57-
poetry-version: "1.4.2"
57+
poetry-version: "2.0.1"
5858

5959
- name: Formatting and validating
6060
run: |

.github/workflows/publish-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
python-version: "3.10"
4848
- uses: abatilo/actions-poetry@v2
4949
with:
50-
poetry-version: "1.4.2"
50+
poetry-version: "2.0.1"
5151
- name: generate release tag
5252
run: |
5353
cd ${{ matrix.package }}

.github/workflows/release_utils.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
python-version: "3.10"
2525
- uses: abatilo/actions-poetry@v2
2626
with:
27-
poetry-version: "1.4.2"
27+
poetry-version: "2.0.1"
2828
- name: Package naming
2929
run: |
3030
echo "PACKAGE_NAME=$(poetry version --no-interaction | cut -d ' ' -f 1)" >> "$GITHUB_ENV"
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# 0.0.1
2-
- Init
2+
- Init
3+
4+
# 1.0.0
5+
- Update pyproject.toml for Poetry 2.0, adopting PEP 621 standards

blueprints-provider/python/RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
| Docker Image Tag | Python Library Version |
44
|------------------|------------------------|
5-
| 0.0.1 | 0.0.1 |
5+
| latest | 1.0.0 |

blueprints-provider/python/poetry.lock

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

blueprints-provider/python/pyproject.toml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
1+
[project]
2+
name = "frinx-blueprints-provider-api"
3+
version = "1.0.0"
4+
description = "Frinx Blueprints Provider graphql schema transformed to pydantic basemodels"
5+
authors = [
6+
{name = "Marek Pastorek",email = "[email protected]>"}
7+
]
8+
readme = "README.md"
9+
keywords = ["blueprints-provider", "api"]
10+
license = {text = "Apache-2.0"}
11+
12+
[project.urls]
13+
Homepage = 'https://github.com/FRINXio/frinx-python-sdk'
14+
Source = 'https://github.com/FRINXio/frinx-python-sdk'
15+
116
[build-system]
2-
requires = ["poetry-core"]
17+
requires = ["poetry-core>=2.0.0,<3.0.0"]
318
build-backend = "poetry.core.masonry.api"
419

20+
[tool.poetry]
21+
packages = [{ include = "frinx_api" }]
22+
523
[tool.poetry.dependencies]
624
python = "^3.10"
725
pydantic = "^2"
@@ -12,20 +30,6 @@ ruff = "^0.0.263"
1230
mypy = "1.3.0"
1331
pyright = "^1.1.317"
1432

15-
[tool.poetry]
16-
packages = [{ include = "frinx_api" }]
17-
name = "frinx-blueprints-provider-api"
18-
description = "Frinx Blueprints Provider graphql schema transformed to pydantic basemodels"
19-
authors = ["Marek Pastorek <[email protected]>"]
20-
version = "0.0.1"
21-
readme = ["README.md", "CHANGELOG.md", "RELEASE.md"]
22-
keywords = ["blueprints-provider", "api"]
23-
license = "Apache 2.0"
24-
25-
[project.urls]
26-
Homepage = 'https://github.com/FRINXio/frinx-python-sdk'
27-
Source = 'https://github.com/FRINXio/frinx-python-sdk'
28-
2933
[tool.pyright]
3034
include = ['frinx_api']
3135
reportGeneralTypeIssues = "none"

frinx-inventory-server/python/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@
2121

2222
# 3.0.0
2323
- Updated API from device-inventory v7.0.0 GraphQL schema.
24+
25+
# 4.0.0
26+
- Update pyproject.toml for Poetry 2.0, adopting PEP 621 standards

frinx-inventory-server/python/RELEASE.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
| Docker Image Tag | Python Library Version |
44
|------------------|------------------------|
5-
| 1.9.3 | 0.0.1, 0.1.0, 1.0.0 |
6-
| 6.0.0 | 2.0.0 |
7-
| 6.1.0 | 2.1.0, 2.1.1 |
8-
| 6.1.1 | 2.2.0 |
9-
| 6.9.0-internal | 2.3.0 |
10-
| 7.0.0 | 3.0.0 |
5+
| 1.9.3 | 0.0.1, 0.1.0, 1.0.0 |
6+
| 6.0.0 | 2.0.0 |
7+
| 6.1.0 | 2.1.0, 2.1.1 |
8+
| 6.1.1 | 2.2.0 |
9+
| 6.9.0-internal | 2.3.0 |
10+
| 7.0.0 | 3.0.0 |
11+
| 7.0.1 | 4.0.0 |

0 commit comments

Comments
 (0)