Skip to content

Commit e39e860

Browse files
Use poetry v2 (#568)
* Update data-platform-workflows to v24.0.5 * Use poetry v2 * Update dpw --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Carl Csaposs <[email protected]>
1 parent 152d431 commit e39e860

File tree

7 files changed

+145
-50
lines changed

7 files changed

+145
-50
lines changed

.github/workflows/ci.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
lint:
1818
name: Lint
19-
uses: canonical/data-platform-workflows/.github/workflows/[email protected].0
19+
uses: canonical/data-platform-workflows/.github/workflows/[email protected].6
2020

2121
unit-test:
2222
name: Unit test charm
@@ -56,7 +56,7 @@ jobs:
5656

5757
build:
5858
name: Build charm
59-
uses: canonical/data-platform-workflows/.github/workflows/[email protected].0
59+
uses: canonical/data-platform-workflows/.github/workflows/[email protected].6
6060
with:
6161
cache: true
6262

@@ -82,7 +82,7 @@ jobs:
8282
- lint
8383
- unit-test
8484
- build
85-
uses: canonical/data-platform-workflows/.github/workflows/[email protected].0
85+
uses: canonical/data-platform-workflows/.github/workflows/[email protected].6
8686
with:
8787
artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}
8888
architecture: ${{ matrix.architecture }}

.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737

3838
build:
3939
name: Build charm
40-
uses: canonical/data-platform-workflows/.github/workflows/[email protected].0
40+
uses: canonical/data-platform-workflows/.github/workflows/[email protected].6
4141

4242
release:
4343
name: Release charm
4444
needs:
4545
- ci-tests
4646
- build
47-
uses: canonical/data-platform-workflows/.github/workflows/[email protected].0
47+
uses: canonical/data-platform-workflows/.github/workflows/[email protected].6
4848
with:
4949
channel: 8.0/edge
5050
artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}

.github/workflows/sync_docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
sync-docs:
1212
name: Sync docs from Discourse
13-
uses: canonical/data-platform-workflows/.github/workflows/[email protected].0
13+
uses: canonical/data-platform-workflows/.github/workflows/[email protected].6
1414
with:
1515
reviewers: a-velasco
1616
permissions:

charmcraft.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ parts:
3131
3232
# Convert subset of poetry.lock to requirements.txt
3333
curl -sSL https://install.python-poetry.org | python3 -
34+
/root/.local/bin/poetry self add poetry-plugin-export
3435
/root/.local/bin/poetry export --only main,charm-libs --output requirements.txt
3536
3637
craftctl default

poetry.lock

+131-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
[tool.poetry]
55
package-mode = false
6+
requires-poetry = ">=2.0.0"
67

78
[tool.poetry.dependencies]
89
python = "^3.10"
@@ -53,19 +54,19 @@ parameterized = "^0.9.0"
5354

5455
[tool.poetry.group.integration.dependencies]
5556
pytest = "^7.4.0"
56-
pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/github_secrets"}
57-
pytest-microceph = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/microceph"}
57+
pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/github_secrets"}
58+
pytest-microceph = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/microceph"}
5859
pytest-operator = "^0.28.0"
59-
pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
60-
pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
60+
pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
61+
pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
6162
juju = "^3.6.0.0"
6263
mysql-connector-python = "~8.0.33"
6364
tenacity = "^8.2.2"
6465
boto3 = "^1.28.11"
6566
pyyaml = "^6.0"
6667
urllib3 = "^1.26.16"
6768
allure-pytest = "^2.13.2"
68-
allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"}
69+
allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"}
6970

7071

7172
[tool.coverage.run]

tox.ini

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ description = Apply coding style standards to code
2323
commands_pre =
2424
poetry install --only format
2525
commands =
26-
poetry lock --no-update
26+
poetry lock
2727
poetry run ruff check --fix {[vars]all_path}
2828
poetry run ruff format {[vars]all_path}
2929

@@ -57,10 +57,6 @@ commands =
5757

5858
[testenv:integration]
5959
description = Run integration tests
60-
set_env =
61-
{[testenv]set_env}
62-
# Workaround for https://github.com/python-poetry/poetry/issues/6958
63-
POETRY_INSTALLER_PARALLEL = false
6460
pass_env =
6561
CI
6662
GITHUB_OUTPUT

0 commit comments

Comments
 (0)