Merge ~racb/git-ubuntu:unpin-pylint into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

[Robie Basak (racb)]

This MP is really only for three commits. The remainder are a Launchpad bug.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:85bef3c41e85d02501ec3028e4bedb882526231b
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/81/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/81/rebuild

review: Approve (continuous-integration)

[Andreas Hasenack (ahasenack)]

Looks good, +1

review: Approve

diff --git a/gitubuntu/source-package-whitelist.txt b/gitubuntu/source-package-whitelist.txt
index 5e20d9e..f966474 100644
--- a/gitubuntu/source-package-whitelist.txt
+++ b/gitubuntu/source-package-whitelist.txt
@@ -891,9 +891,11 @@ zerofree
 zlib
 zope.interface
 # Requested by ahasenack
-skytools3
-pmdk
+lmdb
 ndctl
+pgaudit
+pmdk
+skytools3
 # Requested by mwhudson
 cargo
 rustc
diff --git a/setup.py b/setup.py
index 9aa66e5..f97740c 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@ setup(name='gitubuntu',
         'pygit2==0.24.2',
         'launchpadlib==1.10.6',
         'petname',
+        'pylint',
         'setuptools',
         'keyring<16',  # https://github.com/jaraco/keyrings.alt/issues/28
         'keyrings.alt',
diff --git a/snap-wrappers/wrappers/git-ubuntu-self-test b/snap-wrappers/wrappers/git-ubuntu-self-test
index f57cde7..76b6074 100755
--- a/snap-wrappers/wrappers/git-ubuntu-self-test
+++ b/snap-wrappers/wrappers/git-ubuntu-self-test
@@ -1,6 +1,8 @@
 #!/snap/core/current/bin/bash
 
-python3 -m pylint --ignored-modules=pygit2 -E $SNAP/lib/python3.6/site-packages/gitubuntu/
+cd $SNAP/lib/python3.6/site-packages
+
+python3 -m pylint --ignored-modules=pygit2,py.path -E gitubuntu/
 PYLINT_RC=$?
 
 if [ $PYLINT_RC == 0 ]; then
@@ -8,7 +10,7 @@ if [ $PYLINT_RC == 0 ]; then
 fi
 
 TMPFILE=$(mktemp)
-COVERAGE_FILE=$TMPFILE python3 -m pytest -p no:cacheprovider --cov=$SNAP/lib/python3.6/site-packages/gitubuntu $SNAP/lib/python3.6/site-packages/gitubuntu/*
+COVERAGE_FILE=$TMPFILE python3 -m pytest -p no:cacheprovider --cov=gitubuntu gitubuntu/*
 PYTEST_RC=$?
 unlink $TMPFILE
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e9a74d6..eacf05b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -353,20 +353,6 @@ parts:
          - -usr/bin/xzless
          - -usr/bin/xzmore
       after: [gnupg2]
-   pylint:
-      plugin: python
-      python-version: python3
-      # from https://github.com/PyCQA/pylint/archive/pylint-1.7.2.tar.gz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/pylint-1.7.2.tar.gz
-      source-type: tar
-      source-checksum: sha384/64b4f1fb40d80eb8cfbaa7aa9bf603e8194a882c2689b9a56157216244d834b0c9998467aeb093c8a3b478a10bfe3be6
-      stage:
-         - -usr/bin/py*
-         - -usr/bin/2to3*
-         - -usr/share/*python*
-         - -usr/lib/python3.5
-         - -usr/lib/python3.6
-      after: [python3]
    git-ubuntu:
       plugin: python
       python-version: python3