diff --git a/.gitignore b/.gitignore index e317db5..034cb98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +.venv +.tox dist certbot_nginx_unit.egg-info \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 556ca9f..b13d370 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" diff --git a/setup.py b/setup.py index f0ca008..df66fe6 100644 --- a/setup.py +++ b/setup.py @@ -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") diff --git a/snapcraft.yaml b/snapcraft.yaml index 25ca338..df6b505 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -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: