[Pkg-bitcoin-commits] [electrum] 04/05: Remove pip hackery.

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit 0ed2ae436740d792adf8b2c4cb2bd7fbcd8af303
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Mar 12 21:39:05 2018 +0200

    Remove pip hackery.
---
 .../0001-Do-not-ship-requirements-files.patch       | 21 ---------------------
 debian/patches/0001-Remove-pip-hackery.patch        | 21 +++++++++++++++++++++
 debian/patches/series                               |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian/patches/0001-Do-not-ship-requirements-files.patch b/debian/patches/0001-Do-not-ship-requirements-files.patch
deleted file mode 100644
index 852d966..0000000
--- a/debian/patches/0001-Do-not-ship-requirements-files.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Tristan Seligmann <mithrandi at debian.org>
-Date: Sat, 10 Mar 2018 18:38:21 +0200
-Subject: Do not ship requirements files.
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 63581a6..030993b 100755
---- a/setup.py
-+++ b/setup.py
-@@ -20,7 +20,7 @@ version = imp.load_source('version', 'lib/version.py')
- if sys.version_info[:3] < (3, 4, 0):
-     sys.exit("Error: Electrum requires Python version >= 3.4.0...")
- 
--data_files = ['contrib/requirements/' + r for r in ['requirements.txt', 'requirements-hw.txt']]
-+data_files = []
- 
- if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
-     parser = argparse.ArgumentParser()
diff --git a/debian/patches/0001-Remove-pip-hackery.patch b/debian/patches/0001-Remove-pip-hackery.patch
new file mode 100644
index 0000000..86ca76e
--- /dev/null
+++ b/debian/patches/0001-Remove-pip-hackery.patch
@@ -0,0 +1,21 @@
+From: Tristan Seligmann <mithrandi at debian.org>
+Date: Mon, 12 Mar 2018 21:38:02 +0200
+Subject: Remove pip hackery.
+
+---
+ setup.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 3df887b..7037cd4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -86,8 +86,3 @@ setup(
+     url="https://electrum.org",
+     long_description="""Lightweight Bitcoin Wallet"""
+ )
+-
+-# Optional modules (not required to run Electrum)
+-import pip
+-opt_modules = requirements_hw + ['pycryptodomex']
+-[ pip.main(['install', m]) for m in opt_modules ]
diff --git a/debian/patches/series b/debian/patches/series
index e56fca7..8c7a1a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Do-not-ship-requirements-files.patch
+0001-Remove-pip-hackery.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git