From eac6ee16ca9c2239c8dd20d773188269092b0f7a Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Wed, 18 Sep 2019 10:58:38 +0200
Subject: [PATCH 1/3] Only include images required for install in sdist

---
 MANIFEST.in                                        | 3 ++-
 resources/{img-src => }/org.musicbrainz.Picard.svg | 0
 setup.py                                           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename resources/{img-src => }/org.musicbrainz.Picard.svg (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index b7325ce71..5948dfd05 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -44,7 +44,8 @@ include *.in
 include *.md
 include *.txt
 
-recursive-include resources/images *.png
+recursive-include resources org.musicbrainz.Picard.svg
+recursive-include resources/images org.musicbrainz.Picard.png
 
 recursive-include installer *.in
 recursive-include installer *.ini
diff --git a/resources/img-src/org.musicbrainz.Picard.svg b/resources/org.musicbrainz.Picard.svg
similarity index 100%
rename from resources/img-src/org.musicbrainz.Picard.svg
rename to resources/org.musicbrainz.Picard.svg
diff --git a/setup.py b/setup.py
index 284f11535..a5f58a45e 100644
--- a/setup.py
+++ b/setup.py
@@ -739,7 +739,7 @@ args['data_files'] = [
     for size in (16, 24, 32, 48, 128, 256)
 ]
 
-args['data_files'].append(('share/icons/hicolor/scalable/apps', ['resources/img-src/%s.svg' % PICARD_APP_ID]))
+args['data_files'].append(('share/icons/hicolor/scalable/apps', ['resources/%s.svg' % PICARD_APP_ID]))
 args['data_files'].append(('share/applications', [PICARD_DESKTOP_NAME]))
 
 if sys.platform == 'linux':

From 0dfcedc97562c367ab120133096cbf11b93fe26b Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Wed, 18 Sep 2019 11:54:00 +0200
Subject: [PATCH 2/3] PICARD-1602: Minimize files included in sdist

---
 MANIFEST.in | 48 +++---------------------------------------------
 setup.py    |  3 ++-
 2 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 5948dfd05..c45fb8934 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,42 +1,8 @@
 graft po
+prune test
 
 recursive-include scripts *.in
-
-graft ui
-recursive-include resources *.py
-
-recursive-include test *.py
-recursive-include test/data *.aac
-recursive-include test/data *.aiff
-recursive-include test/data *.ape
-recursive-include test/data *.asf
-recursive-include test/data *.dat
-recursive-include test/data *.dsf
-recursive-include test/data *.flac
-recursive-include test/data *.gif
-recursive-include test/data *.ini
-recursive-include test/data *.jpg
-recursive-include test/data *.json
-recursive-include test/data *.m4a
-recursive-include test/data *.m4v
-recursive-include test/data *.mid
-recursive-include test/data *.mp3
-recursive-include test/data *.mpc
-recursive-include test/data *.ofr
-recursive-include test/data *.ofs
-recursive-include test/data *.oga
-recursive-include test/data *.ogg
-recursive-include test/data *.ogv
-recursive-include test/data *.opus
-recursive-include test/data *.png
-recursive-include test/data *.spx
-recursive-include test/data *.tak
-recursive-include test/data *.tta
-recursive-include test/data *.wav
-recursive-include test/data *.wma
-recursive-include test/data *.wmv
-recursive-include test/data *.wv
-recursive-include test/data/testplugins *.zip
+recursive-exclude scripts picard
 
 include tagger.py
 include *.in
@@ -44,12 +10,4 @@ include *.in
 include *.md
 include *.txt
 
-recursive-include resources org.musicbrainz.Picard.svg
-recursive-include resources/images org.musicbrainz.Picard.png
-
-recursive-include installer *.in
-recursive-include installer *.ini
-recursive-include installer/images *.bmp
-recursive-include installer/images *.ico
-recursive-include installer/images *.svg
-recursive-include installer/languages *.nsh
+exclude org.musicbrainz.Picard.appdata.xml
diff --git a/setup.py b/setup.py
index a5f58a45e..be44af48f 100644
--- a/setup.py
+++ b/setup.py
@@ -223,7 +223,8 @@ class picard_build(build):
             args['name'] = 'MusicBrainz Picard'
             file_version = PICARD_VERSION[0:3] + PICARD_VERSION[4:]
             args['file_version'] = '.'.join([str(v) for v in file_version])
-            generate_file('installer/picard-setup.nsi.in', 'installer/picard-setup.nsi', args)
+            if os.path.isfile('installer/picard-setup.nsi.in'):
+                generate_file('installer/picard-setup.nsi.in', 'installer/picard-setup.nsi', args)
             version_args = {
                 'filevers': str(file_version),
                 'prodvers': str(file_version),

From 555f5a4e8ed7e3d0a8cb52cfcd3d6f486735c38a Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Wed, 18 Sep 2019 11:54:57 +0200
Subject: [PATCH 3/3] PICARD-1602: Removed CI sdist tests again

---
 .travis.yml               |  1 -
 scripts/run-sdist-test.sh | 13 -------------
 2 files changed, 14 deletions(-)
 delete mode 100755 scripts/run-sdist-test.sh

diff --git a/.travis.yml b/.travis.yml
index a986d947e..a5501a990 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,6 @@ matrix:
     install: skip
     script:
     - pip3 install .
-    - scripts/run-sdist-test.sh
   fast_finish: true
 
 before_cache:
diff --git a/scripts/run-sdist-test.sh b/scripts/run-sdist-test.sh
deleted file mode 100755
index d977b01fe..000000000
--- a/scripts/run-sdist-test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Build the sdist archive, extract it and run the tests.
-
-set -e
-
-rm -rf dist
-python3 setup.py sdist
-cd dist
-SDIST_ARCHIVE=$(echo picard-*.tar.gz)
-tar xvf $SDIST_ARCHIVE
-cd ${SDIST_ARCHIVE%.tar.gz}
-python3 setup.py test