From d0303f5fff9c744aa101767166e94277c9e3259f Mon Sep 17 00:00:00 2001 From: Dario Faccin Date: Fri, 24 Mar 2023 11:21:19 +0100 Subject: [PATCH] Pin Charmed Operator Framework version for charms Change-Id: Iff5659151e5678298b72e54b7b22a375bc7b7ebf Signed-off-by: Dario Faccin --- .../charm/juju-simplestreams-operator/requirements.txt | 2 +- installers/charm/osm-lcm/requirements.txt | 2 +- installers/charm/osm-lcm/tox.ini | 2 +- installers/charm/osm-mon/requirements.txt | 2 +- installers/charm/osm-mon/tox.ini | 2 +- installers/charm/osm-nbi/requirements.txt | 2 +- installers/charm/osm-nbi/tox.ini | 2 +- installers/charm/osm-ng-ui/requirements.txt | 2 +- installers/charm/osm-pol/requirements.txt | 2 +- installers/charm/osm-pol/tox.ini | 2 +- installers/charm/osm-ro/requirements.txt | 2 +- installers/charm/osm-ro/tox.ini | 2 +- installers/charm/vca-integrator-operator/charmcraft.yaml | 9 ++------- .../charm/vca-integrator-operator/requirements.txt | 4 ++-- installers/charm/vca-integrator-operator/tox.ini | 2 +- 15 files changed, 17 insertions(+), 22 deletions(-) diff --git a/installers/charm/juju-simplestreams-operator/requirements.txt b/installers/charm/juju-simplestreams-operator/requirements.txt index cb303a31..398d4ad3 100644 --- a/installers/charm/juju-simplestreams-operator/requirements.txt +++ b/installers/charm/juju-simplestreams-operator/requirements.txt @@ -17,7 +17,7 @@ # # To get in touch with the maintainers, please contact: # osm-charmers@lists.launchpad.net -ops >= 1.2.0 +ops < 2.2 lightkube lightkube-models # git+https://github.com/charmed-osm/config-validator/ diff --git a/installers/charm/osm-lcm/requirements.txt b/installers/charm/osm-lcm/requirements.txt index cb303a31..398d4ad3 100644 --- a/installers/charm/osm-lcm/requirements.txt +++ b/installers/charm/osm-lcm/requirements.txt @@ -17,7 +17,7 @@ # # To get in touch with the maintainers, please contact: # osm-charmers@lists.launchpad.net -ops >= 1.2.0 +ops < 2.2 lightkube lightkube-models # git+https://github.com/charmed-osm/config-validator/ diff --git a/installers/charm/osm-lcm/tox.ini b/installers/charm/osm-lcm/tox.ini index 6d39e4bb..8c1816ea 100644 --- a/installers/charm/osm-lcm/tox.ini +++ b/installers/charm/osm-lcm/tox.ini @@ -60,7 +60,7 @@ deps = isort codespell commands = - codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \ + codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \ --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \ --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg # pflake8 wrapper supports config from pyproject.toml diff --git a/installers/charm/osm-mon/requirements.txt b/installers/charm/osm-mon/requirements.txt index cb303a31..398d4ad3 100644 --- a/installers/charm/osm-mon/requirements.txt +++ b/installers/charm/osm-mon/requirements.txt @@ -17,7 +17,7 @@ # # To get in touch with the maintainers, please contact: # osm-charmers@lists.launchpad.net -ops >= 1.2.0 +ops < 2.2 lightkube lightkube-models # git+https://github.com/charmed-osm/config-validator/ diff --git a/installers/charm/osm-mon/tox.ini b/installers/charm/osm-mon/tox.ini index 4fe914c8..65a62868 100644 --- a/installers/charm/osm-mon/tox.ini +++ b/installers/charm/osm-mon/tox.ini @@ -60,7 +60,7 @@ deps = isort codespell commands = - codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \ + codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \ --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \ --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg # pflake8 wrapper supports config from pyproject.toml diff --git a/installers/charm/osm-nbi/requirements.txt b/installers/charm/osm-nbi/requirements.txt index 5ee9d5cf..761edd85 100644 --- a/installers/charm/osm-nbi/requirements.txt +++ b/installers/charm/osm-nbi/requirements.txt @@ -17,7 +17,7 @@ # # To get in touch with the maintainers, please contact: # osm-charmers@lists.launchpad.net -ops >= 1.2.0 +ops < 2.2 lightkube lightkube-models git+https://github.com/charmed-osm/config-validator/ diff --git a/installers/charm/osm-nbi/tox.ini b/installers/charm/osm-nbi/tox.ini index 5200e6c0..33004e2a 100644 --- a/installers/charm/osm-nbi/tox.ini +++ b/installers/charm/osm-nbi/tox.ini @@ -63,7 +63,7 @@ deps = commands = # uncomment the following line if this charm owns a lib codespell {[vars]lib_path} - codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \ + codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \ --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \ --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg # pflake8 wrapper supports config from pyproject.toml diff --git a/installers/charm/osm-ng-ui/requirements.txt b/installers/charm/osm-ng-ui/requirements.txt index 5ee9d5cf..761edd85 100644 --- a/installers/charm/osm-ng-ui/requirements.txt +++ b/installers/charm/osm-ng-ui/requirements.txt @@ -17,7 +17,7 @@ # # To get in touch with the maintainers, please contact: # osm-charmers@lists.launchpad.net -ops >= 1.2.0 +ops < 2.2 lightkube lightkube-models git+https://github.com/charmed-osm/config-validator/ diff --git a/installers/charm/osm-pol/requirements.txt b/installers/charm/osm-pol/requirements.txt index cb303a31..398d4ad3 100644 --- a/installers/charm/osm-pol/requirements.txt +++ b/installers/charm/osm-pol/requirements.txt @@ -17,7 +17,7 @@ # # To get in touch with the maintainers, please contact: # osm-charmers@lists.launchpad.net -ops >= 1.2.0 +ops < 2.2 lightkube lightkube-models # git+https://github.com/charmed-osm/config-validator/ diff --git a/installers/charm/osm-pol/tox.ini b/installers/charm/osm-pol/tox.ini index 6d39e4bb..8c1816ea 100644 --- a/installers/charm/osm-pol/tox.ini +++ b/installers/charm/osm-pol/tox.ini @@ -60,7 +60,7 @@ deps = isort codespell commands = - codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \ + codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \ --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \ --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg # pflake8 wrapper supports config from pyproject.toml diff --git a/installers/charm/osm-ro/requirements.txt b/installers/charm/osm-ro/requirements.txt index cb303a31..398d4ad3 100644 --- a/installers/charm/osm-ro/requirements.txt +++ b/installers/charm/osm-ro/requirements.txt @@ -17,7 +17,7 @@ # # To get in touch with the maintainers, please contact: # osm-charmers@lists.launchpad.net -ops >= 1.2.0 +ops < 2.2 lightkube lightkube-models # git+https://github.com/charmed-osm/config-validator/ diff --git a/installers/charm/osm-ro/tox.ini b/installers/charm/osm-ro/tox.ini index c9745096..e3fd0019 100644 --- a/installers/charm/osm-ro/tox.ini +++ b/installers/charm/osm-ro/tox.ini @@ -63,7 +63,7 @@ deps = commands = # uncomment the following line if this charm owns a lib codespell {[vars]lib_path} --ignore-words-list=Ro,RO,ro - codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \ + codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \ --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \ --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg --ignore-words-list=Ro,RO,ro # pflake8 wrapper supports config from pyproject.toml diff --git a/installers/charm/vca-integrator-operator/charmcraft.yaml b/installers/charm/vca-integrator-operator/charmcraft.yaml index 0d7d5ebc..95d0e96d 100644 --- a/installers/charm/vca-integrator-operator/charmcraft.yaml +++ b/installers/charm/vca-integrator-operator/charmcraft.yaml @@ -25,11 +25,6 @@ bases: channel: "20.04" parts: charm: - build-environment: - - CRYPTOGRAPHY_DONT_BUILD_RUST: 1 + charm-binary-python-packages: [cryptography, bcrypt] build-packages: - - build-essential - - libssl-dev - - libffi-dev - - python3-dev - - cargo + - libffi-dev \ No newline at end of file diff --git a/installers/charm/vca-integrator-operator/requirements.txt b/installers/charm/vca-integrator-operator/requirements.txt index 66e845a3..014a28dd 100644 --- a/installers/charm/vca-integrator-operator/requirements.txt +++ b/installers/charm/vca-integrator-operator/requirements.txt @@ -14,6 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -ops >= 1.2.0 -juju +ops < 2.2 +juju < 3 pyyaml \ No newline at end of file diff --git a/installers/charm/vca-integrator-operator/tox.ini b/installers/charm/vca-integrator-operator/tox.ini index 1893353c..f9b5b224 100644 --- a/installers/charm/vca-integrator-operator/tox.ini +++ b/installers/charm/vca-integrator-operator/tox.ini @@ -62,7 +62,7 @@ deps = -r{toxinidir}/requirements.txt commands = codespell {[vars]lib_path} - codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \ + codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \ --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \ --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg pylint -E {[vars]src_path} -- 2.17.1