From 2cb4e56be3292203c7d6b92a5401c2f78df4a496 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 27 Mar 2021 03:44:00 +0100 Subject: [PATCH] sdist build: let pip install put ~everything from tar.gz to site-packages (well, not everything, only files in electrum/ (so e.g. not contrib)) See comment in setup.py. E.g. we have been including the www/ folder in the tar.gz but have not been installing it to site-packages. Now we do. Or we have been including the kivy GUI files in the tar.gz but not installing them. Now we do. I like this because it simplifies setup.py and should be easier to reason about too. should fix #7089 (at least when using the tar.gz) --- setup.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index fc5d9c71a..efcd5dd0f 100755 --- a/setup.py +++ b/setup.py @@ -79,17 +79,10 @@ setup( package_dir={ 'electrum': 'electrum' }, - package_data={ - '': ['*.txt', '*.json', '*.ttf', '*.otf', '*.csv'], - 'electrum': [ - 'wordlist/*.txt', - 'locale/*/LC_MESSAGES/electrum.mo', - 'lnwire/*.csv', - ], - 'electrum.gui': [ - 'icons/*', - ], - }, + # Note: MANIFEST.in lists what gets included in the tar.gz, and the + # package_data kwarg lists what gets put in site-packages when pip installing the tar.gz. + # By specifying include_package_data=True, MANIFEST.in becomes responsible for both. + include_package_data=True, scripts=['electrum/electrum'], data_files=data_files, description="Lightweight Bitcoin Wallet",