Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update required python version #24

Merged
merged 10 commits into from
Apr 5, 2024
Merged

Update required python version #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
15500bc
Update setup.cfg
Thanhphan1147 Apr 4, 2024
de50727
fix dependencies for indico 3.3.1 and bump major version
Thanhphan1147 Apr 4, 2024
554ab74
python3.12 with pyenv
Thanhphan1147 Apr 5, 2024
52efa24
add missing deps
Thanhphan1147 Apr 5, 2024
a43e8c4
patch tox env path for github runner
Thanhphan1147 Apr 5, 2024
06affe9
add missing trailing new line
Thanhphan1147 Apr 5, 2024
2bdea6b
update runner label
Thanhphan1147 Apr 5, 2024
6aac3b7
add missing libs
Thanhphan1147 Apr 5, 2024
d6ce5a1
update path
Thanhphan1147 Apr 5, 2024
f47d8e5
workaround for pflake8 issue with python3.12
Thanhphan1147 Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .github/test-pre-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,15 @@
# See LICENSE file for licensing details.

# Call script with sudo to install the required native libraries for installing the plugin's dependencies
sudo bash -xe "$(dirname "$0")"/../install-libs.sh
sudo bash -xe "$(dirname "$0")"/../install-libs.sh

# Install python 3.12.2
# We don't activate after installing since this is not required by default
# python 3.12.3 will be installed in $HOME/.pyenv/versions/3.12.2/bin
curl https://pyenv.run | bash
export PYENV_ROOT="$HOME/.pyenv"
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
pyenv install 3.12.2
Thanhphan1147 marked this conversation as resolved.
Show resolved Hide resolved
pyenv doctor
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
with:
pre-run-script: .github/test-pre-script.sh
self-hosted-runner: true
self-hosted-runner-label: "edge"
self-hosted-runner-label: "jammy"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Thanhphan1147 is this really intended? the "jammy" label is automatically added by operator workflows since canonical/operator-workflows#275 . As no flavour is specified, you may still get "edge" as one is randomly selected.
Same for .github/workflows/test.yaml

provider: lxd
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
with:
pre-run-script: .github/test-pre-script.sh
self-hosted-runner: true
self-hosted-runner-label: "edge"
self-hosted-runner-label: "jammy"
4 changes: 3 additions & 1 deletion install-libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ if [ "$EUID" -ne 0 ]
fi

apt-get update
apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl libpython3-dev gcc libpq-dev
apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl libpython3-dev gcc libpq-dev \
libxslt1-dev libffi-dev libpcre3-dev libyaml-dev build-essential libbz2-dev libreadline-dev libsqlite3-dev \
libjpeg-turbo8-dev zlib1g-dev liblzma-dev
3,266 changes: 1,892 additions & 1,374 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ branch = true
# Formatting tools configuration
[tool.black]
line-length = 99
target-version = ["py38"]
target-version = ["py312"]

[tool.coverage.report]
fail_under = 95
Expand Down Expand Up @@ -62,19 +62,19 @@ disable = "wrong-import-order"

[tool.poetry]
name = "flask-multipass-saml-groups"
version = "0.3.0"
version = "1.0.0"
description = "This package provides an identity provider for Flask-Multipass, which allows you to use SAML groups. It is designed to be used as a plugin for Indico."
authors = ["canonical-is-devops <[email protected]>"]
license = "Apache-2.0 license"
readme = "README.md"

[tool.poetry.dependencies]
python = ">=3.10, <3.12"
flask-multipass = {extras = ["saml"], version = "0.4.9"}
python = "~=3.12.2"
flask-multipass = {extras = ["saml"], version = "0.5.4"}
# The package version here can force an upgrade of indico when the plugin is used
# thus we must only specify compatibility rather than pinning the exact version
indico = ">=3.2.8, <4"
flask_sqlalchemy = "3.0.3"
indico = ">=3.3.1, <4"
flask_sqlalchemy = "3.0.5"

[build-system]
requires = ["poetry-core"]
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ author_email = [email protected]
[options]
packages = find:
include_package_data = true
python_requires = ~=3.8
python_requires = ~=3.12.2
Thanhphan1147 marked this conversation as resolved.
Show resolved Hide resolved
install_requires =
flask-multipass[saml]>=0.4.8
flask-multipass[saml]>=0.5.4

[options.package_data]
flask_multipass_saml_groups = migrations/*.py
Expand Down
13 changes: 11 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ all_path = {[vars]src_path} {[vars]tst_path}

[testenv]
setenv =
# patched path for github runners so that tox can find python3.12
PATH = /home/ubuntu/.pyenv/versions/3.12.2/bin:{env:PATH}
PYTHONPATH = {toxinidir}:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
PY_COLORS=1
PIP_NO_BINARY = xmlsec
passenv =
PYTHONPATH
basepython = python3.12

[testenv:fmt]
description = Apply coding style standards to code
Expand Down Expand Up @@ -58,8 +62,11 @@ commands =
--skip {toxinidir}/build --skip {toxinidir}/venv \
--skip {toxinidir}/.mypy_cache \
--skip {toxinidir}/poetry.lock
# pflake8 wrapper supports config from pyproject.toml
pflake8 {[vars]all_path} --ignore=W503
# pflake8 wrapper supports config from pyproject.toml.
# There's a known compatibility issue with pflake8 and python3.12.
# However, flake8 output is checked in operator-workflow.
# As a result we use this as a temporary workaround!
flake8 --version
isort --check-only --diff {[vars]all_path}
black --check --diff {[vars]all_path}
mypy {[vars]all_path}
Expand All @@ -73,6 +80,7 @@ deps =
coverage[toml]
poetry
pytest
setuptools
commands_pre =
poetry install --no-root
commands =
Expand Down Expand Up @@ -117,6 +125,7 @@ deps =
pytest-operator
# Pin juju version to avoid issues with version 3.3.1.0
juju >=3.0,<=3.3.0
setuptools
commands_pre =
poetry install --no-root
commands =
Expand Down
Loading