From 8a1d160f9e753b8a201bca964b44df3832d3bee8 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 31 Mar 2017 17:05:13 +0200
Subject: [pkg] do not pass weird information to install_requires

this commit deliberately *duplicates* the dependency information between
the setup.py and requirements.pip.

The rationale behind it is that one of them is the generic dependency
information, to be passed to system helpers in order to package it.

The requirements.pip has any pinning information that we want to impose
during development, and it behaves as a well-known set.

Read https://caremad.io/posts/2013/07/setup-vs-requirement/ for more
explanations.

- Resolves: #8830
---
 client/setup.py | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

(limited to 'client/setup.py')

diff --git a/client/setup.py b/client/setup.py
index 235e731c..1954ba17 100644
--- a/client/setup.py
+++ b/client/setup.py
@@ -18,14 +18,12 @@
 setup file for leap.soledad.client
 """
 import re
+import sys
 from setuptools import setup
 from setuptools import find_packages
 from setuptools import Command
 import versioneer
 
-from pkg import utils
-
-
 trove_classifiers = (
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
@@ -110,21 +108,16 @@ cmdclass["freeze_debianver"] = freeze_debianver
 
 # XXX add ref to docs
 
-requirements = utils.parse_requirements()
-
-if utils.is_develop_mode():
-    print
-    print("[WARNING] Skipping leap-specific dependencies "
-          "because development mode is detected.")
-    print("[WARNING] You can install "
-          "the latest published versions with "
-          "'pip install -r pkg/requirements-leap.pip'")
-    print("[WARNING] Or you can instead do 'python setup.py develop' "
-          "from the parent folder of each one of them.")
-    print
+install_requires = [
+    'twisted', 'scrypt', 'zope.proxy', 'cryptography',
+    'leap.common', 'leap.soledad.common', 'treq']
+
+# needed until kali merges the py3 fork back into the main pysqlcipher repo
+if sys.version_info >= (3, 0):
+    install_requires += ['pysqlcipher3']
 else:
-    requirements += utils.parse_requirements(
-        reqfiles=["pkg/requirements-leap.pip"])
+    install_requires += ['pysqlcipher']
+
 
 setup(
     name='leap.soledad.client',
@@ -148,6 +141,6 @@ setup(
     namespace_packages=["leap", "leap.soledad"],
     packages=find_packages('src'),
     package_dir={'': 'src'},
-    install_requires=requirements,
+    install_requires=install_requires,
     extras_require={'signaling': ['leap.common>=0.3.0']},
 )
-- 
cgit v1.2.3