From 23a1077401b987a64c22efe6a0b9751c8549e865 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 22 Jul 2015 12:23:18 -0400
Subject: [pkg] separate leap requirements

this is part of a process to make the setup of the development mode less
troublesome. from now on, setting up a virtualenv in pure development
mode will be as easy as telling pip to just install the external
dependencies::

  pip install -r pkg/requirements.pip

and traversing all the leap repos for the needed leap dependencies doing::

  python setup.py develop

- Related: #7288
---
 setup.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 499a9ee..ead8982 100644
--- a/setup.py
+++ b/setup.py
@@ -111,6 +111,22 @@ 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
+else:
+    requirements += utils.parse_requirements(
+        reqfiles=["pkg/requirements-leap.pip"])
+
 setup(
     name='leap.mail',
     version=VERSION,
@@ -130,7 +146,7 @@ setup(
     package_dir={'': 'src'},
     packages=find_packages('src'),
     test_suite='leap.mail.load_tests.load_tests',
-    install_requires=utils.parse_requirements(),
+    install_requires=requirements,
     tests_require=utils.parse_requirements(
         reqfiles=['pkg/requirements-testing.pip']),
 )
-- 
cgit v1.2.3


From c279e6587f9240d7eb9806996bc84d09cc5d8c97 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 18 Aug 2015 11:29:57 -0400
Subject: [style] pep8 excludes + fixes

---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index ead8982..575a6ec 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,10 @@ Setup file for leap.mail
 import re
 from setuptools import setup
 from setuptools import find_packages
+from setuptools import Command
+
+from pkg import utils
+
 
 import versioneer
 versioneer.versionfile_source = 'src/leap/mail/_version.py'
@@ -27,7 +31,6 @@ versioneer.versionfile_build = 'leap/mail/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
 versioneer.parentdir_prefix = 'leap.mail-'
 
-from pkg import utils
 
 trove_classifiers = [
     'Development Status :: 4 - Beta',
@@ -63,9 +66,6 @@ if len(_version_short) > 0:
 cmdclass = versioneer.get_cmdclass()
 
 
-from setuptools import Command
-
-
 class freeze_debianver(Command):
     """
     Freezes the version in a debian branch.
-- 
cgit v1.2.3