From 3e94cafa43d464d73815e21810b97a4faf54136d Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Sun, 18 Jun 2017 11:18:10 -0300
Subject: [pkg] unify client and server into a single python package

We have been discussing about this merge for a while.
Its main goal is to simplify things: code navigation, but also
packaging.

The rationale is that the code is more cohesive in this way, and there's
only one source package to install.

Dependencies that are only for the server or the client will not be
installed by default, and they are expected to be provided by the
environment. There are setuptools extras defined for the client and the
server.

Debianization is still expected to split the single source package into
3 binaries.

Another avantage is that the documentation can now install a single
package with a single step, and therefore include the docstrings into
the generated docs.

- Resolves: #8896
---
 client/pkg/__init__.py                 |  0
 client/pkg/generate_wheels.sh          | 13 ------
 client/pkg/pip_install_requirements.sh | 84 ----------------------------------
 client/pkg/requirements-latest.pip     |  5 --
 client/pkg/requirements-leap.pip       |  2 -
 client/pkg/requirements.pip            |  7 ---
 6 files changed, 111 deletions(-)
 delete mode 100644 client/pkg/__init__.py
 delete mode 100755 client/pkg/generate_wheels.sh
 delete mode 100755 client/pkg/pip_install_requirements.sh
 delete mode 100644 client/pkg/requirements-latest.pip
 delete mode 100644 client/pkg/requirements-leap.pip
 delete mode 100644 client/pkg/requirements.pip

(limited to 'client/pkg')

diff --git a/client/pkg/__init__.py b/client/pkg/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/client/pkg/generate_wheels.sh b/client/pkg/generate_wheels.sh
deleted file mode 100755
index a13e2c7a..00000000
--- a/client/pkg/generate_wheels.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Generate wheels for dependencies
-# Use at your own risk.
-
-if [ "$WHEELHOUSE" = "" ]; then
-    WHEELHOUSE=$HOME/wheelhouse
-fi
-
-pip wheel --wheel-dir $WHEELHOUSE pip
-pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements.pip
-if [ -f pkg/requirements-testing.pip ]; then
-   pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements-testing.pip
-fi
diff --git a/client/pkg/pip_install_requirements.sh b/client/pkg/pip_install_requirements.sh
deleted file mode 100755
index f4b5f67a..00000000
--- a/client/pkg/pip_install_requirements.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-# Update pip and install LEAP base/testing requirements.
-# For convenience, $insecure_packages are allowed with insecure flags enabled.
-# Use at your own risk.
-# See $usage for help
-
-insecure_packages=""
-leap_wheelhouse=https://lizard.leap.se/wheels
-
-show_help() {
-    usage="Usage: $0 [--testing] [--use-leap-wheels]\n --testing\t\tInstall dependencies from requirements-testing.pip\n
-\t\t\tOtherwise, it will install requirements.pip\n
---use-leap-wheels\tUse wheels from leap.se"
-    echo -e $usage
-
-    exit 1
-}
-
-process_arguments() {
-    testing=false
-    while [ "$#" -gt 0 ]; do
-	# From http://stackoverflow.com/a/31443098
-	case "$1" in
-	    --help) show_help;;
-	    --testing) testing=true; shift 1;;
-	    --use-leap-wheels) use_leap_wheels=true; shift 1;;
-
-	    -h) show_help;;
-	    -*) echo "unknown option: $1" >&2; exit 1;;
-	esac
-    done
-}
-
-return_wheelhouse() {
-    if $use_leap_wheels ; then
-	WHEELHOUSE=$leap_wheelhouse
-    elif [ "$WHEELHOUSE" = "" ]; then
-	WHEELHOUSE=$HOME/wheelhouse
-    fi
-
-    # Tested with bash and zsh
-    if [[ $WHEELHOUSE != http* && ! -d "$WHEELHOUSE" ]]; then
-	    mkdir $WHEELHOUSE
-    fi
-
-    echo "$WHEELHOUSE"
-}
-
-return_install_options() {
-    wheelhouse=`return_wheelhouse`
-    install_options="-U --find-links=$wheelhouse"
-    if $use_leap_wheels ; then
-	install_options="$install_options --trusted-host lizard.leap.se"
-    fi
-
-    echo $install_options
-}
-
-return_insecure_flags() {
-    for insecure_package in $insecure_packages; do
-	flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package"
-    done
-
-    echo $flags
-}
-
-return_packages() {
-    if $testing ; then
-	packages="-r pkg/requirements-testing.pip"
-    else
-	packages="-r pkg/requirements.pip"
-    fi
-
-    echo $packages
-}
-
-process_arguments $@
-install_options=`return_install_options`
-insecure_flags=`return_insecure_flags`
-packages=`return_packages`
-
-pip install -U wheel
-pip install -U pip
-pip install $install_options $insecure_flags $packages
diff --git a/client/pkg/requirements-latest.pip b/client/pkg/requirements-latest.pip
deleted file mode 100644
index d32e1ffa..00000000
--- a/client/pkg/requirements-latest.pip
+++ /dev/null
@@ -1,5 +0,0 @@
---index-url https://pypi.python.org/simple/
-
--e 'git+https://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common'
--e '../common'
--e .
diff --git a/client/pkg/requirements-leap.pip b/client/pkg/requirements-leap.pip
deleted file mode 100644
index 920d4123..00000000
--- a/client/pkg/requirements-leap.pip
+++ /dev/null
@@ -1,2 +0,0 @@
-leap.common>=0.4.3
-leap.soledad.common>=0.9.0
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip
deleted file mode 100644
index 8983b6b5..00000000
--- a/client/pkg/requirements.pip
+++ /dev/null
@@ -1,7 +0,0 @@
-scrypt
-zope.proxy
-twisted
-cryptography
-pysqlcipher;python_version=="2.7"
-pysqlcipher3;python_version=="3.4"
-treq
-- 
cgit v1.2.3