Merge ~ack/gitlptools:snap-core22 into gitlptools:master

[Alberto Donato]

move snap to core22, move setup metadata to setup.cfg

diff --git a/setup.cfg b/setup.cfg
index 601a2f3..0abdf7b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,29 @@
+[metadata]
+name = gitlptools
+version = 1.0
+
+[options]
+packages = find:
+package_dir =
+  = src
+setup_requires =
+  pytest-runner
+tests_require =
+  pytest
+install_requires =
+  attrs
+  GitPython
+  launchpadlib
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
+console_scripts =
+    git-lp-approve = gitlptools:git_lp_approve
+    git-lp-open = gitlptools:git_lp_open
+    git-lp-propose = gitlptools:git_lp_propose
+
 [aliases]
 test=pytest
 
diff --git a/setup.py b/setup.py
index f172873..d903a55 100755
--- a/setup.py
+++ b/setup.py
@@ -5,21 +5,4 @@
 
 from setuptools import setup
 
-
-VERSION = '1.0'
-
-
-setup(
-    name='gitlptools',
-    version=VERSION,
-    packages=['gitlptools'],
-    package_dir={'': 'src'},
-    setup_requires=['pytest-runner'],
-    tests_require=['pytest'],
-    install_requires=['attrs', 'GitPython', 'launchpadlib'],
-    entry_points={
-        'console_scripts': ['git-lp-approve=gitlptools:git_lp_approve',
-                            'git-lp-open=gitlptools:git_lp_open',
-                            'git-lp-propose=gitlptools:git_lp_propose'],
-    }
-)
+setup()
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index bc3c236..c1d2f7c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,4 @@
 name: gitlptools
-version: git
 summary: Tools to make git work well with Launchpad
 description: |
   A collection of plugins to make working with git and Launchpad a nicer
@@ -8,49 +7,31 @@ description: |
 grade: stable
 confinement: classic # Needs classic, since we don't know which git repos it
                      # wants to access.
-base: core20
+base: core22
+adopt-info: gitlptools
 
 apps:
   git-lp-approve:
-    command: bin/python3 $SNAP/bin/git-lp-approve
+    command: bin/git-lp-approve
   git-lp-open:
-    command: bin/python3 $SNAP/bin/git-lp-open
+    command: bin/git-lp-open
   git-lp-propose:
-    command: bin/python3 $SNAP/bin/git-lp-propose
+    command: bin/git-lp-propose
 
 parts:
   gitlptools:
     # See 'snapcraft plugins'
     plugin: python
     source: .
-    # python3-oauth is needed since the version on pypi doesn't support
-    # Python3.
-    # python3-secretstorage is needed so that the LP API credentials can
-    # be saved somewhere.
-    # The keyring packages are needed so that launchpadlib has a place
-    # to store its secrets when running inside containers.
-    stage-packages: 
-        - python3-oauth
-        - python3-secretstorage
-        - python3-keyring
-        - python3-keyrings.alt
-        - python3-gi
-        - libpython3-stdlib
-        - libpython3.8-stdlib
-        - libpython3.8-minimal
-        - python3-wheel
-        - python3-venv
-        - python3-minimal
-        - python3-distutils
-        - python3-pkg-resources
-        - python3.8-minimal
+    python-packages:
+      - keyring
+      - keyrings.alt
+      - SecretStorage
     override-build: |
-        snapcraftctl build
+        craftctl default
 
         version="$(git rev-parse --short HEAD)"
-        snapcraftctl set-version "$version"
-
-        ln -sf ../usr/bin/python3.8 $SNAPCRAFT_PART_INSTALL/bin/python3
+        craftctl set version="$version"
 
   elisp:
     plugin: dump