diff --git a/certbot/certbot/_internal/snap_config.py b/certbot/certbot/_internal/snap_config.py index 2e54ac64c..e07ee6c08 100644 --- a/certbot/certbot/_internal/snap_config.py +++ b/certbot/certbot/_internal/snap_config.py @@ -71,7 +71,7 @@ def prepare_env(cli_args: List[str]) -> List[str]: raise e data = response.json() - connections = ['/snap/{0}/current/lib/python3.10/site-packages/'.format(item['slot']['snap']) + connections = ['/snap/{0}/current/lib/python3.12/site-packages/'.format(item['slot']['snap']) for item in data.get('result', {}).get('established', []) if item.get('plug', {}).get('plug') == 'plugin' and item.get('plug-attrs', {}).get('content') == 'certbot-1'] diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index af243044d..e444991a8 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -14,7 +14,7 @@ description: | - Keep track of when your certificate is going to expire, and renew it - Help you revoke the certificate if that ever becomes necessary. confinement: classic -base: core22 +base: core24 grade: stable adopt-info: certbot @@ -25,8 +25,8 @@ apps: PATH: "$SNAP/bin:$SNAP/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" AUGEAS_LENS_LIB: "$SNAP/usr/share/augeas/lenses/dist" CERTBOT_SNAPPED: "True" - #PYTHONHOME: "$SNAP" - #PYTHONPATH: "$SNAP/lib/python3.10/site-packages:$SNAP/usr/lib/python3/dist-packages:$SNAP/usr/lib/python3.10:${PYTHONPATH}" + PYTHONHOME: "$SNAP" + PYTHONPATH: "$SNAP/lib/python3.12/site-packages:$SNAP/usr/lib/python3/dist-packages:$SNAP/usr/lib/python3.12:${PYTHONPATH}" renew: command: bin/python3 -s $SNAP/bin/certbot -q renew daemon: oneshot @@ -49,7 +49,7 @@ parts: - ./certbot-apache - ./certbot-nginx stage: - - -usr/lib/python3.10/sitecustomize.py # maybe unnecessary + - -usr/lib/python3.12/sitecustomize.py # maybe unnecessary # Old versions of this file used to unstage # lib/python3.8/site-packages/augeas.py to avoid conflicts between # python-augeas 0.5.0 which was pinned in snap-constraints.txt and @@ -59,18 +59,18 @@ parts: # effect so we now stage the file to keep the auto-generated cffi file. stage-packages: - libaugeas0 - - libpython3.10-dev + - libpython3.12-dev # added to stage python: - libpython3-stdlib - - libpython3.10-stdlib - - libpython3.10-minimal + - libpython3.12-stdlib + - libpython3.12-minimal - python3-pip - python3-wheel - python3-venv - python3-minimal - python3-pkg-resources - - python3.10-minimal - - python3.10-venv + - python3.12-minimal + - python3.12-venv # To build cryptography and cffi if needed build-packages: - gcc