electrum

commit 281805a0a4bb7e01a8ec623be9ea23d7505bb9a0
parent f7dce426cb81ac999e6f0ca02ef50b8122b4d71f
Author: SomberNight <somber.night@protonmail.com>
Date:   Fri, 20 Jul 2018 16:38:18 +0200

linux sdist: 'typing' was not included, which is needed on py3.4

not making typing conditioned on py version as then freeze_packages would not pick it up.

Diffstat:
M
contrib/deterministic-build/requirements.txt
 | 
6
++++--
M
contrib/requirements/requirements.txt
 | 
1
+
M
setup.py
 | 
1
-

3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt
@@ -16,8 +16,6 @@ idna==2.7 \
 jsonrpclib-pelix==0.3.1 \
     --hash=sha256:5417b1508d5a50ec64f6e5b88907f111155d52607b218ff3ba9a777afb2e49e3 \
     --hash=sha256:bd89a6093bc4d47dc8a096197aacb827359944a4533be5193f3845f57b9f91b4
-pbkdf2==1.3 \
-    --hash=sha256:ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979
 pip==10.0.1 \
     --hash=sha256:717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7 \
     --hash=sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68
@@ -56,6 +54,10 @@ setuptools==40.0.0 \
 six==1.11.0 \
     --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \
     --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb
+typing==3.6.4 \
+    --hash=sha256:3a887b021a77b292e151afb75323dea88a7bc1b3dfa92176cff8e44c8b68bddf \
+    --hash=sha256:b2c689d54e1144bbcfd191b0832980a21c2dbcf7b5ff7a66248a60c90e951eb8 \
+    --hash=sha256:d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2
 urllib3==1.23 \
     --hash=sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf \
     --hash=sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5
diff --git a/contrib/requirements/requirements.txt b/contrib/requirements/requirements.txt
@@ -7,3 +7,4 @@ dnspython
 jsonrpclib-pelix
 PySocks>=1.6.6
 qdarkstyle<3.0
+typing>=3.0.0
diff --git a/setup.py b/setup.py
@@ -43,7 +43,6 @@ if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
 extras_require = {
     'hardware': requirements_hw,
     'fast': ['pycryptodomex'],
-    ':python_version < "3.5"': ['typing>=3.0.0'],
 }
 extras_require['full'] = extras_require['hardware'] + extras_require['fast']