diff --git a/charmcraft.yaml b/charmcraft.yaml index 14fd402..a40a8a9 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -3,12 +3,6 @@ parts: charm: source: src plugin: reactive - build-snaps: - # temporary fix because charm cannot install/build on 20.04 using - # charm/3.x without unnecessary dependency in wheelhouse.txt: - # Jinja2<3;python_version == '3.8' - # setuptools~=46.0.0;python_version == '3.8' - - charm/2.x/stable bases: - build-on: - name: ubuntu diff --git a/src/metadata.yaml b/src/metadata.yaml index f419771..425f00d 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -14,7 +14,6 @@ tags: # https://jujucharms.com/docs/stable/authors-charm-metadata - backup subordinate: true -series: [] provides: nrpe-external-master: interface: nrpe-external-master diff --git a/src/requirements.txt b/src/requirements.txt index 47e3c05..5d35e6e 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -2,3 +2,7 @@ croniter pidfile fabric +# NOTE(rgildein): The contextvars could not be installed without this requirement to be specified. +setuptools>=42 +# NOTE(rgildein): The typing-extensions could not be installed without this requirement to be specified. +flit-core>=3 diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index e7a5072..c411668 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,3 +1,7 @@ distro<1.7.0 croniter pidfile +# NOTE(rgildein): The contextvars could not be installed without this requirement to be specified. +setuptools>=42 +# NOTE(rgildein): The typing-extensions could not be installed without this requirement to be specified. +flit-core>=3