summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-07-22 16:03:50 -0400
committerKali Kaneko <kali@leap.se>2015-07-22 16:37:25 -0400
commit5b5e5b935b58f430dc12842bc111b2ba9d0973a9 (patch)
tree9babdbc03a812d22531d66284c1fabfe1f4a154a
parent0c53c7f3fd76895cbb355bdc71818ae26af73432 (diff)
[pkg] do not add leap deps in develop mode
it is the responsibility of the developer to install them now - Related: #7288
-rw-r--r--pkg/utils.py18
-rw-r--r--setup.py18
2 files changed, 31 insertions, 5 deletions
diff --git a/pkg/utils.py b/pkg/utils.py
index dd3deaca..9c9211be 100644
--- a/pkg/utils.py
+++ b/pkg/utils.py
@@ -14,16 +14,30 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
"""
Utils to help in the setup process
"""
-
import os
import re
import sys
+def is_develop_mode():
+ """
+ Returns True if we're calling the setup script using the argument for
+ setuptools development mode.
+
+ This avoids messing up with dependency pinning and order, the
+ responsibility of installing the leap dependencies is left to the
+ developer.
+ """
+ args = sys.argv
+ devflags = "setup.py", "develop"
+ if (args[0], args[1]) == devflags:
+ return True
+ return False
+
+
def get_reqs_from_files(reqfiles):
"""
Returns the contents of the top requirement file listed as a
diff --git a/setup.py b/setup.py
index f554e09e..adca6e1f 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',