diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1cd9edc1..8fc1a1e5 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -35,6 +35,7 @@ jobs: run: sudo apt --yes install apparmor-utils libsasl2-dev python3-dev libldap2-dev libssl-dev slapd ldap-utils - name: App armor configuration for slapd run: sudo aa-complain /usr/sbin/slapd + - run: poetry --version - run: poetry install - run: poetry run pytest minversions: @@ -56,6 +57,7 @@ jobs: run: sudo aa-complain /usr/sbin/slapd - name: Force minimum dependency versions run: sed -i -E 's/"(\^|>=)([0-9])/"==\2/' pyproject.toml + - run: poetry --version - run: poetry install - run: poetry run pytest style: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4956d485..ae2f2eef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,6 +50,14 @@ python311: - poetry install - poetry run pytest +minversions: + image: python:3.8 + stage: test + script: + - sed -i -E 's/"(\^|>=)([0-9])/"==\2/' pyproject.toml + - poetry install + - poetry run pytest + doc: image: python:3.11 stage: test diff --git a/poetry.lock b/poetry.lock index ea9e5cea..ad1e4f11 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1938,5 +1938,5 @@ sentry = ["sentry-sdk"] [metadata] lock-version = "2.0" -python-versions = ">=3.8, <4" -content-hash = "013f52b11b33e916ff159b7dfb8a88bd6a3897bf23c0ac5ee6ecd8156dcf6f68" +python-versions = "^3.8" +content-hash = "2afc1e78435e1b3164c02286897e7d2f56a63dc17f3b820e5904cd86659cafec" diff --git a/pyproject.toml b/pyproject.toml index 4f5b9e7b..e160fac3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,20 +35,20 @@ readme = "README.md" include = ["canaille/translations/*/LC_MESSAGES/*.mo"] [tool.poetry.dependencies] -python = ">=3.8, <4" +python = "^3.8" authlib = "^1.2.1" -click = "<9" -email_validator = "<3" -flask = "<2.3" +click = ">=7.0.0" +email_validator = "^2.0.0" +flask = ">=2.0 <2.3" flask-babel = "^3.0.0" flask-themer = "^2.0.0" -flask-wtf = "<2" -pycountry = "^22.3.5" -python-ldap = "<4" -pytz = "^2023.3" -toml = "<1" -wtforms = "<4" -werkzeug = "<2.3" +flask-wtf = "^1.1.1" +pycountry = "^22.0.0" +python-ldap = "^3.4.0" +pytz = ">=2023.3" +toml = "^0.10.0" +wtforms = "^3.0.1" +werkzeug = ">=2.0 <2.3" "sentry-sdk" = {version = "<2", optional=true, extras=["flask"]} @@ -59,7 +59,7 @@ optional = true "sphinx" = "*" "sphinx-rtd-theme" = "*" "sphinx-issues" = "*" -pygments-ldif = "^1.0.1" +pygments-ldif = "==1.0.1" [tool.poetry.group.dev.dependencies] coverage = {version = "*", extras=["toml"]} @@ -71,10 +71,10 @@ pre-commit = "*" pyquery = "*" pytest = "*" pytest-coverage = "*" -pytest-flask = "^1.2.0" +pytest-flask = "==1.2.0" pytest-httpserver = "*" -pytest-lazy-fixture = "^0.6.3" -pytest-xdist = "^3.3.1" +pytest-lazy-fixture = "==0.6.3" +pytest-xdist = "==3.3.1" slapd = "*" smtpdfix = "*"