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.

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

Upgrade to snapcraft core24 and certbot >=2.12 #3

Merged
merged 2 commits into from
Dec 21, 2024
Merged
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.venv
.tox
dist
certbot_nginx_unit.egg-info
8 changes: 7 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -19,11 +19,17 @@ classifiers = [
"License :: OSI Approved :: MIT License",
"Intended Audience :: System Administrators",
"Topic :: Security :: Cryptography",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Security",
"Topic :: System :: Installation/Setup",
"Topic :: System :: Networking",
"Topic :: System :: Systems Administration",
"Topic :: Utilities",
"Development Status :: 5 - Production/Stable",
"Environment :: Plugins",
"Operating System :: OS Independent",
]
dynamic = ["optional-dependencies", "version"]
dynamic = ["dependencies", "version"]

[project.urls]
Homepage = "https://github.com/kea/certbot-nginx-unit"
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -7,9 +7,11 @@
"pytest",
]

certbot_version = '2.12.0.dev0'

install_requires = []
if not os.environ.get("SNAP_BUILD"):
install_requires.extend(["acme>=1.21", "certbot>=1.21"])
install_requires.extend([f'acme>={certbot_version}', f'certbot>={certbot_version}'])
else:
install_requires.append("packaging")

20 changes: 10 additions & 10 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -6,24 +6,24 @@ description: |
See https://github.com/kea/certbot-nginx-unit for installation and usage instructions.
confinement: strict
grade: stable
base: core20
base: core24
adopt-info: certbot-nginx-unit
license: MIT
website: https://github.com/kea/certbot-nginx-unit
issues: https://github.com/kea/certbot-nginx-unit/issues

architectures:
- build-on: amd64
- build-on: armhf
- build-on: arm64
platforms:
amd64:
armhf:
arm64:

parts:
certbot-nginx-unit:
plugin: python
source: .
override-build: |
snapcraftctl build
snapcraftctl set-version `grep " version =" $SNAPCRAFT_PART_BUILD/version.py | cut -f3 -d= | tr -d "'[:space:]"`
craftctl build
craftctl set version=$(grep " version =" $CRAFT_PART_BUILD/version.py | cut -f3 -d= | tr -d "'[:space:]")
build-packages:
- git
build-environment:
@@ -33,15 +33,15 @@ parts:
source: .
stage: [ setup.py, certbot-shared ]
override-pull: |
snapcraftctl pull
mkdir -p $SNAPCRAFT_PART_SRC/certbot-shared
craftctl default
mkdir -p $CRAFT_PART_SRC/certbot-shared

slots:
certbot:
interface: content
content: certbot-1
read:
- $SNAP/lib/python3.8/site-packages
- $SNAP/lib/python3.12/site-packages

plugs:
certbot-metadata: