summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-05-09 23:24:06 +0900
committerKali Kaneko <kali@leap.se>2013-05-09 23:24:06 +0900
commite507bc2b31d0405db3901764ce5254c1a7254ff3 (patch)
tree9998e88b81fff03a73b8e4f94d59812492d5478b
parent2d0762f05ff304b2d229915e5d20ae9e435e8003 (diff)
fix broken pip install
-rw-r--r--.gitignore2
-rw-r--r--MANIFEST.in1
-rw-r--r--changes/bug_fix-pip-install1
-rw-r--r--setup.py13
4 files changed, 13 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 8ff62281..42580d30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
*.log
*.pyc
dist/
+build/
MANIFEST
*.egg-info/
+
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..152a4ce6
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include pkg/soledad
diff --git a/changes/bug_fix-pip-install b/changes/bug_fix-pip-install
new file mode 100644
index 00000000..fcb58295
--- /dev/null
+++ b/changes/bug_fix-pip-install
@@ -0,0 +1 @@
+ o Fix broken pip install
diff --git a/setup.py b/setup.py
index d13a6f71..919cf34c 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
+import os
from setuptools import (
setup,
find_packages
@@ -39,7 +39,7 @@ install_requirements = [
# platform-supplied package, or install Twisted by downloading a tarball,
# unpacking it, and running setup.py."
# - https://twistedmatrix.com/trac/wiki/FrequentlyAskedQuestions
- 'twisted==13.0.0', # TODO: maybe we just want twisted-web?
+ 'twisted>=12.0.0', # TODO: maybe we just want twisted-web?
# twisted cannot be installed separately using pip.
'u1db',
'requests',
@@ -62,12 +62,17 @@ tests_requirements = [
'testscenarios',
]
+if os.environ.get('VIRTUAL_ENV', None):
+ data_files = None
+else:
+ # XXX this should go only for linux/mac
+ data_files = [("/etc/init.d/", ["pkg/soledad"])]
setup(
name='leap.soledad',
# TODO: change version according to decisions regarding soledad versus
# leap client versions.
- version='0.0.1-dev',
+ version='0.0.2-dev',
url='https://leap.se/',
license='GPLv3+',
description='Synchronization of locally encrypted data among devices.',
@@ -85,5 +90,5 @@ setup(
install_requires=install_requirements,
tests_require=tests_requirements,
dependency_links=dependency_links,
- data_files = [("/etc/init.d/", ["pkg/soledad"])]
+ data_files = data_files
)