summaryrefslogtreecommitdiff
path: root/mail/pkg
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-23 12:42:02 +0200
committerKali Kaneko <kali@leap.se>2013-08-23 12:43:17 +0200
commit698c4cbf18933cf083b543806b5a6e11019a90da (patch)
tree038abb02621322532ded8db9c42f443ef8929280 /mail/pkg
parent7af87f588cd384455f8df77be188bf52ab33d045 (diff)
improve packaging
Diffstat (limited to 'mail/pkg')
-rw-r--r--mail/pkg/__init__.py0
-rw-r--r--mail/pkg/requirements-testing.pip2
-rw-r--r--mail/pkg/requirements.pip6
-rw-r--r--mail/pkg/utils.py84
4 files changed, 90 insertions, 2 deletions
diff --git a/mail/pkg/__init__.py b/mail/pkg/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mail/pkg/__init__.py
diff --git a/mail/pkg/requirements-testing.pip b/mail/pkg/requirements-testing.pip
new file mode 100644
index 00000000..7233634f
--- /dev/null
+++ b/mail/pkg/requirements-testing.pip
@@ -0,0 +1,2 @@
+setuptools-trial
+mock
diff --git a/mail/pkg/requirements.pip b/mail/pkg/requirements.pip
index d8888fd4..13d8b6a7 100644
--- a/mail/pkg/requirements.pip
+++ b/mail/pkg/requirements.pip
@@ -1,2 +1,4 @@
-leap.soledad>=0.0.2-dev
-twisted
+leap.soledad.client>=0.3.0
+leap.common>=0.3.0
+leap.keymanager>=0.3.0
+twisted # >= 12.0.3 ??
diff --git a/mail/pkg/utils.py b/mail/pkg/utils.py
new file mode 100644
index 00000000..deace14b
--- /dev/null
+++ b/mail/pkg/utils.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+# utils.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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 get_reqs_from_files(reqfiles):
+ """
+ Returns the contents of the top requirement file listed as a
+ string list with the lines
+
+ @param reqfiles: requirement files to parse
+ @type reqfiles: list of str
+ """
+ for reqfile in reqfiles:
+ if os.path.isfile(reqfile):
+ return open(reqfile, 'r').read().split('\n')
+
+
+def parse_requirements(reqfiles=['requirements.txt',
+ 'requirements.pip',
+ 'pkg/requirements.pip']):
+ """
+ Parses the requirement files provided.
+
+ Checks the value of LEAP_VENV_SKIP_PYSIDE to see if it should
+ return PySide as a dep or not. Don't set, or set to 0 if you want
+ to install it through pip.
+
+ @param reqfiles: requirement files to parse
+ @type reqfiles: list of str
+ """
+
+ requirements = []
+ skip_pyside = os.getenv("LEAP_VENV_SKIP_PYSIDE", "0") != "0"
+ for line in get_reqs_from_files(reqfiles):
+ # -e git://foo.bar/baz/master#egg=foobar
+ if re.match(r'\s*-e\s+', line):
+ pass
+ # do not try to do anything with externals on vcs
+ #requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1',
+ #line))
+ # http://foo.bar/baz/foobar/zipball/master#egg=foobar
+ elif re.match(r'\s*https?:', line):
+ requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', r'\1',
+ line))
+ # -f lines are for index locations, and don't get used here
+ elif re.match(r'\s*-f\s+', line):
+ pass
+
+ # argparse is part of the standard library starting with 2.7
+ # adding it to the requirements list screws distro installs
+ elif line == 'argparse' and sys.version_info >= (2, 7):
+ pass
+ elif line == 'PySide' and skip_pyside:
+ pass
+ # do not include comments
+ elif line.lstrip().startswith('#'):
+ pass
+ else:
+ if line != '':
+ requirements.append(line)
+
+ return requirements