diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 9983701..c5f4bd8 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -10,5 +10,5 @@ jobs: with: pre-run-script: .github/test-pre-script.sh self-hosted-runner: true - self-hosted-runner-label: "jammy" + self-hosted-runner-label: "edge" provider: lxd diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7e461d0..01b5a8d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,4 +10,4 @@ jobs: with: pre-run-script: .github/test-pre-script.sh self-hosted-runner: true - self-hosted-runner-label: "jammy" + self-hosted-runner-label: "edge" diff --git a/README.md b/README.md index 0c0333f..2107f8a 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,10 @@ but groups are a very useful feature for Indico. This plugin provides a solution ## Installation +### Development +This package is managed though [Poetry](https://python-poetry.org/). You can run `poetry install` to run it and `poetry build` to build it. + + ### Package installation You need to install the package on the same virtual environment as your Indico instance. You might use the following commands to switch to the Indico environment @@ -33,9 +37,7 @@ sudo bash install-libs.sh You can then install this package either via local source: ```bash -git clone https://github.com/canonical/flask-multipass-saml-groups.git -cd flask-multipass-saml-groups -python setup.py install +poetry install ``` or with pip: diff --git a/poetry.lock b/poetry.lock index 230381e..c2d03d5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2602,10 +2602,9 @@ files = [ [package.dependencies] defusedxml = "0.6.0" -isodate = "0.6.1" -# Indico pins lxml -lxml = ">=5.2.1" -xmlsec = "1.3.13" +isodate = ">=0.5.0" +lxml = ">=3.3.5" +xmlsec = ">=1.0.5" [package.extras] test = ["coverage (>=4.5.2)", "coveralls (==1.5.1)", "flake8 (==3.6.0)", "freezegun (==0.3.11)", "pylint (==1.9.4)"] @@ -3673,4 +3672,4 @@ test = ["pytest"] [metadata] lock-version = "2.0" python-versions = "~=3.12.2" -content-hash = "34ca1cd0a0d0540dd4a810f82f8a5bb3c19feb37cf6bc44015e319c0bb982ea1" +content-hash = "c20f96aa563d099919ce2097cad916660815a0d7f68a35177a56ce7ff4368aa2" diff --git a/pyproject.toml b/pyproject.toml index ebed2d0..7dd81ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,6 +75,7 @@ flask-multipass = {extras = ["saml"], version = "0.5.4"} # thus we must only specify compatibility rather than pinning the exact version indico = ">=3.3.1, <4" flask_sqlalchemy = "3.0.5" +xmlsec = "1.3.13" [tool.poetry.plugins."indico.plugins"] saml_groups = "flask_multipass_saml_groups.plugin:SAMLGroupsPlugin"