Skip to content

Commit

Permalink
fix release pipeline (#40)
Browse files Browse the repository at this point in the history
## Proposal
Fixing releases after a bad merge

## Context
- Installing setuptools manually can be flaky, so remove it entirely.

## Commits

* fixed application build

* reverted ubuntu version

* Update test_pgbouncer_provider.py

* Update charmcraft.yaml
  • Loading branch information
Will Fitch authored Dec 12, 2022
1 parent dc80083 commit b3db153
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ bases:

parts:
charm:
charm-binary-python-packages: [psycopg2-binary==2.9.5, setuptools]
charm-binary-python-packages: [psycopg2-binary==2.9.5]
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ bases:
- name: "ubuntu"
channel: "20.04"


parts:
charm:
charm-binary-python-packages: [psycopg2-binary==2.9.5, setuptools]
charm-binary-python-packages: [psycopg2-binary==2.9.3]
2 changes: 2 additions & 0 deletions tests/integration/relations/pgbouncer_provider/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
from pytest_operator.plugin import OpsTest


@pytest.mark.abort_on_fail
@pytest.fixture(scope="module")
async def application_charm(ops_test: OpsTest):
"""Build the application charm."""
test_charm_path = "./tests/integration/relations/pgbouncer_provider/application-charm"
return await ops_test.build_charm(test_charm_path)


@pytest.mark.abort_on_fail
@pytest.fixture(scope="module")
async def pgb_charm(ops_test: OpsTest):
"""Build the pgbouncer charm."""
Expand Down

0 comments on commit b3db153

Please sign in to comment.