From 9c79c40930b3f1a031ab3b157ce702eecedad8af Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 22 Jul 2015 10:31:59 -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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 778909d..f554e09 100644
--- a/setup.py
+++ b/setup.py
@@ -107,6 +107,10 @@ cmdclass["freeze_debianver"] = freeze_debianver
 
 # XXX add ref to docs
 
+requirements = (
+    utils.parse_requirements() +
+    utils.parse_requirements(reqfiles=["pkg/requirements-leap.pip"]))
+
 setup(
     name='leap.keymanager',
     version=VERSION,
@@ -129,7 +133,7 @@ setup(
     packages=find_packages('src', exclude=['leap.keymanager.tests']),
     package_dir={'': 'src'},
     test_suite='leap.keymanager.tests',
-    install_requires=utils.parse_requirements(),
+    install_requires=requirements,
     tests_require=utils.parse_requirements(
         reqfiles=['pkg/requirements-testing.pip']),
 )
-- 
cgit v1.2.3


From 5b5e5b935b58f430dc12842bc111b2ba9d0973a9 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 22 Jul 2015 16:03:50 -0400
Subject: [pkg] do not add leap deps in develop mode

it is the responsibility of the developer to install them now

- Related: #7288
---
 setup.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index f554e09..adca6e1 100644
--- a/setup.py
+++ b/setup.py
@@ -107,9 +107,21 @@ cmdclass["freeze_debianver"] = freeze_debianver
 
 # XXX add ref to docs
 
-requirements = (
-    utils.parse_requirements() +
-    utils.parse_requirements(reqfiles=["pkg/requirements-leap.pip"]))
+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.keymanager',
-- 
cgit v1.2.3


From 8c0072ba922396f25fd124488381bf593ef3baa1 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 17 Aug 2015 21:52:55 -0400
Subject: [style] pep8 fixes

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

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index adca6e1..26840c6 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,10 @@ setup file for leap.keymanager
 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/keymanager/_version.py'
@@ -27,8 +31,6 @@ versioneer.versionfile_build = 'leap/keymanager/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
 versioneer.parentdir_prefix = 'leap.keymanager-'
 
-from pkg import utils
-
 trove_classifiers = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
@@ -59,9 +61,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