diff options
| -rw-r--r-- | pkg/client/requirements.pip | 4 | ||||
| -rw-r--r-- | pkg/server/requirements.pip | 3 | ||||
| -rw-r--r-- | setup.py | 127 |
3 files changed, 41 insertions, 93 deletions
diff --git a/pkg/client/requirements.pip b/pkg/client/requirements.pip index 8983b6b5..d7f5a8f7 100644 --- a/pkg/client/requirements.pip +++ b/pkg/client/requirements.pip @@ -1,7 +1,7 @@ +twisted +treq scrypt zope.proxy -twisted cryptography pysqlcipher;python_version=="2.7" pysqlcipher3;python_version=="3.4" -treq diff --git a/pkg/server/requirements.pip b/pkg/server/requirements.pip index 8354e94c..0bfcab5e 100644 --- a/pkg/server/requirements.pip +++ b/pkg/server/requirements.pip @@ -1,6 +1,5 @@ -configparser PyOpenSSL -twisted>=12.3.0 +configparser Beaker couchdb # Upstream needs a patch for py3 compatibility @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # setup.py -# Copyright (C) 2013 LEAP +# Copyright (C) 2013-2017 LEAP Encryption Access Project # # 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 @@ -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/>. """ -setup file for leap.soledad +Setup file for leap.soledad """ import os import re @@ -24,11 +24,8 @@ import versioneer from setuptools import setup from setuptools import find_packages -from setuptools import Command from setuptools.command.develop import develop as _cmd_develop -from pkg import utils - isset = lambda var: os.environ.get(var, None) if isset('VIRTUAL_ENV') or isset('LEAP_SKIP_INIT'): @@ -39,20 +36,19 @@ else: trove_classifiers = ( - "Development Status :: 3 - Alpha", + "Development Status :: 4 - Beta", "Intended Audience :: Developers", "License :: OSI Approved :: " "GNU General Public License v3 or later (GPLv3+)", "Environment :: Console", "Operating System :: OS Independent", "Operating System :: POSIX", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Topic :: Database :: Front-Ends", "Topic :: Software Development :: Libraries :: Python Modules" ) -DOWNLOAD_BASE = ('https://github.com/leapcode/bitmask_client/' +DOWNLOAD_BASE = ('https://github.com/leapcode/soledad/' 'archive/%s.tar.gz') _versions = versioneer.get_versions() VERSION = _versions['version'] @@ -66,56 +62,6 @@ if len(_version_short) > 0: DOWNLOAD_URL = DOWNLOAD_BASE % VERSION_SHORT -class freeze_debianver(Command): - - """ - Freezes the version in a debian branch. - To be used after merging the development branch onto the debian one. - """ - user_options = [] - template = """ -# This file was generated by the `freeze_debianver` command in setup.py -# Using 'versioneer.py' (0.16) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json -import sys - -version_json = ''' -{ - "dirty": false, - "error": null, - "full-revisionid": "FULL_REVISIONID", - "version": "VERSION_STRING" -} -''' # END VERSION_JSON - -def get_versions(): - return json.loads(version_json) -""" - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - proceed = str(raw_input( - "This will overwrite the file _version.py. Continue? [y/N] ")) - if proceed != "y": - print("He. You scared. Aborting.") - return - subst_template = self.template.replace( - 'VERSION_STRING', VERSION_SHORT).replace( - 'FULL_REVISIONID', VERSION_REVISION) - versioneer_cfg = versioneer.get_config_from_root('.') - with open(versioneer_cfg.versionfile_source, 'w') as f: - f.write(subst_template) - - class cmd_develop(_cmd_develop): def run(self): # versioneer: @@ -127,47 +73,50 @@ class cmd_develop(_cmd_develop): cmdclass = versioneer.get_cmdclass() -cmdclass["freeze_debianver"] = freeze_debianver cmdclass["develop"] = cmd_develop - -# XXX add ref to docs - -install_requires = [] -for reqfile in ["pkg/common/requirements.pip", - "pkg/client/requirements.pip", - "pkg/server/requirements.pip"]: - install_requires += utils.parse_requirements([reqfile]) +install_requires = [ + 'pyasn1', + 'service-identity', + 'twisted', + 'treq', + 'paste', # deprecate + 'routes', # deprecate + 'six' +] + +client = [ + 'cryptography', + 'scrypt', # XXX deprecate this, cryptography does with recent openssl + 'zope.proxy', +] # needed until kali merges the py3 fork back into the main pysqlcipher repo if sys.version_info.major >= 3: - install_requires += ['pysqlcipher3'] -else: - install_requires += ['pysqlcipher'] - -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/{common,client,server}/requirements-leap.pip'") - print("[WARNING] Or you can instead do 'python setup.py develop' " - "from the parent folder of each one of them.") - print + client += ['pysqlcipher3'] else: - reqfiles = [ - "pkg/common/requirements-leap.pip", - "pkg/client/requirements-leap.pip", - "pkg/server/requirements-leap.pip", - ] - install_requires += utils.parse_requirements(reqfiles=reqfiles) + client += ['pysqlcipher'] + +server = [ + 'configparser', + 'Beaker', + 'couchdb' +] + +signaling = ['leap.common'] + + +extras = { + 'client': client, + 'server': server, + 'signaling': signaling +} setup( name='leap.soledad', version=versioneer.get_version(), cmdclass=cmdclass, - url='https://leap.se/', + url='https://soledad.readthedocs.io/', download_url=DOWNLOAD_URL, license='GPLv3+', description='Synchronization of locally encrypted data among devices.', @@ -186,6 +135,6 @@ setup( package_dir={'': 'src'}, package_data={'': ["*.sql"]}, install_requires=install_requires, - extras_require={'signaling': ['leap.common>=0.3.0']}, + extras_require=extras, data_files=data_files ) |