diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rwxr-xr-x | deb_release.sh | 8 | ||||
| -rw-r--r-- | debian/changelog | 91 | ||||
| -rw-r--r-- | debian/clean | 1 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 16 | ||||
| -rw-r--r-- | debian/copyright | 30 | ||||
| -rw-r--r-- | debian/pydist-overrides | 4 | ||||
| -rwxr-xr-x | debian/rules | 11 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | pkg/requirements.pip | 1 | ||||
| -rw-r--r-- | src/leap/mail/_version.py | 210 |
12 files changed, 175 insertions, 202 deletions
@@ -24,6 +24,9 @@ o Send a BYE command to all open connections, so that the MUA is notified when the server is shutted down. +0.3.11 Jan 05, 2015: + o Port `enum` to `enum34` (Closes #6601) + 0.3.10 Sept 26, 2014: o MessageCollection iterator now creates the LeapMessage with the collection reference, so setFlags will work properly. diff --git a/deb_release.sh b/deb_release.sh new file mode 100755 index 0000000..79e7e24 --- /dev/null +++ b/deb_release.sh @@ -0,0 +1,8 @@ +#!/bin/zsh + +VERSION_FILE="src/leap/mail/_version.py" +rm ${VERSION_FILE} +python setup.py freeze_debianver +sed -i 's/-dirty//g' ${VERSION_FILE} +git add ${VERSION_FILE} +git ci -m "freeze debian version" diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..7a15d5b --- /dev/null +++ b/debian/changelog @@ -0,0 +1,91 @@ +leap-mail (0.4.0~rc2) unstable; urgency=medium + + * Update to 0.4.0rc2 release. + * Update description to fix capitalization and short description + + -- Micah Anderson <micah@leap.se> Tue, 01 Sep 2015 14:34:54 -0400 + +leap-mail (0.3.11.1) UNRELEASED; urgency=medium + + [ Micah Anderson ] + * Update Standards version to 3.9.6 (no changes) + * Update debian/copyright to fix space-in-std-shortname + + -- Micah Anderson <micah@leap.se> Tue, 13 Jan 2015 16:49:11 -0500 + +leap-mail (0.3.11) unstable; urgency=medium + + * Update to 0.3.11 release. + + -- Ben Carrillo <ben@futeisha.org> Thu, 08 Jan 2015 14:46:17 -0400 + +leap-mail (0.3.9.1) unstable; urgency=medium + + * Change twisted dependency for more specific sub-packages. + + -- Ben Carrillo <ben@futeisha.org> Thu, 14 Aug 2014 11:24:06 -0500 + +leap-mail (0.3.9) unstable; urgency=low + + * Update to 0.3.9 release + + -- Ben Carrillo <ben@futeisha.org> Wed, 09 Apr 2014 16:11:32 -0500 + +leap-mail (0.3.8) unstable; urgency=low + + * Update to 0.3.8 release + + -- Ben Carrillo <ben@futeisha.org> Tue, 10 Dec 2013 18:09:13 -0400 + +leap-mail (0.3.7) unstable; urgency=low + + * Update to 0.3.7 release + + -- Ben Carrillo <ben@futeisha.org> Fri, 15 Nov 2013 23:24:27 -0200 + +leap-mail (0.3.6) unstable; urgency=low + + * Update to 0.3.6 release. + + -- Ben Carrillo <ben@futeisha.org> Tue, 05 Nov 2013 11:34:59 -0200 + +leap-mail (0.3.4) unstable; urgency=low + + * Update to 0.3.4 release. + + -- Micah Anderson <micah@leap.se> Mon, 14 Oct 2013 17:23:10 -0300 + +leap-mail (0.3.3.1) unstable; urgency=low + + * Add python-leap.soledad.client and python-leap.keymanager to + debian/pydist-overrides + + -- Micah Anderson <micah@leap.se> Tue, 24 Sep 2013 20:59:01 -0400 + +leap-mail (0.3.3) unstable; urgency=low + + * Update to 0.3.3 release. + + -- Micah Anderson <micah@leap.se> Tue, 24 Sep 2013 16:59:35 -0400 + +leap-mail (0.3.2) unstable; urgency=low + + * Update to 0.3.2 release. + + -- Micah Anderson <micah@leap.se> Thu, 12 Sep 2013 14:21:13 +0200 + +leap-mail (0.3.1) unstable; urgency=low + + * Update to 0.3.1 release. + * Add leap.common to pydist-overrides. + * Update debian/control extended description to fit length + * Add debian/copyright + * Install CHANGELOG. + + -- Micah Anderson <micah@leap.se> Tue, 27 Aug 2013 11:50:38 +0200 + +leap-mail (0.3.1~pre) unstable; urgency=low + + * Initial import + + -- Micah Anderson <micah@leap.se> Thu, 22 Aug 2013 17:30:34 -0400 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..2955dac --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +src/leap.mail.egg-info/* diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..5df8411 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: leap-mail +Maintainer: Micah Anderson <micah@leap.se> +Section: python +Priority: optional +Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-python +Standards-Version: 3.9.6 + +Package: leap-mail +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, python-twisted-core, python-twisted-mail +Suggests: bitmask +Description: LEAP Bitmask client mail support + This package contains the client-side Python components that the desktop + client uses for interacting with server-side leap_mx. It includes an SMTP + proxy and a local IMAP server that will fetch mail from the remote incoming + queue backed up by Soledad. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7a9d97b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: leap-mail +Upstream-Contact: info@leap.se +Source: <http://github.com/leapcode/leap_mail/> + +Files: * +Copyright: 2012,2013 The LEAP Encryption Access Project +License: GPL-3+ with OpenSSL exception + This package is released under the GNU GPL, version 3 or a later revision. + For further details see the COPYING file. + . + On Debian systems, the full text of the GNU General Public + License version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. + . + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + . + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. + +# REVIEW-ME This needs a licensecheck -r run !!! -- kali diff --git a/debian/pydist-overrides b/debian/pydist-overrides new file mode 100644 index 0000000..4115618 --- /dev/null +++ b/debian/pydist-overrides @@ -0,0 +1,4 @@ +zope.interface python-zope.interface +leap.soledad.client soledad-client ; PEP386 +leap.common python-leap-common ; PEP386 +leap.keymanager leap-keymanager diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e81414a --- /dev/null +++ b/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +# This file was automatically generated by stdeb 0.6.0+git at +# Thu, 22 Aug 2013 17:30:34 -0400 + +%: + dh $@ --with python2 --buildsystem=python_distutils + +override_dh_installchangelogs: + dh_installchangelogs CHANGELOG + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 0caa66b..0871319 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,4 +1,3 @@ zope.interface -twisted # >= 12.0.3 ?? zope.proxy service-identity diff --git a/src/leap/mail/_version.py b/src/leap/mail/_version.py index b77d552..3e4676b 100644 --- a/src/leap/mail/_version.py +++ b/src/leap/mail/_version.py @@ -1,205 +1,13 @@ -import subprocess -import sys -import re -import os.path -IN_LONG_VERSION_PY = True -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (build by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. +# This file was generated by the `freeze_debianver` command in setup.py +# Using 'versioneer.py' (0.7+) 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. -# This file is released into the public domain. Generated by -# versioneer-0.7+ (https://github.com/warner/python-versioneer) +version_version = '0.4.0rc2' +version_full = '974511645819ef2559fb0c064fdea4bcc926e6d8' -# these strings will be replaced by git during git-archive -git_refnames = "$Format:%d$" -git_full = "$Format:%H$" - -def run_command(args, cwd=None, verbose=False): - try: - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd) - except EnvironmentError: - e = sys.exc_info()[1] - if verbose: - print("unable to run %s" % args[0]) - print(e) - return None - stdout = p.communicate()[0].strip() - if sys.version >= '3': - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % args[0]) - return None - return stdout - - -def get_expanded_variables(versionfile_source): - # the code embedded in _version.py can just fetch the value of these - # variables. When used from setup.py, we don't want to import - # _version.py, so we do it with a regexp instead. This function is not - # used from _version.py. - variables = {} - try: - f = open(versionfile_source, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - variables["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - variables["full"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return variables - - -def versions_from_expanded_variables(variables, tag_prefix, verbose=False): - refnames = variables["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("variables are unexpanded, not using") - return {} # unexpanded, so not in an unpacked git-archive tarball - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full": variables["full"].strip()} - # no suitable tags, so we use the full revision id - if verbose: - print("no suitable tags, using full revision id") - return {"version": variables["full"].strip(), - "full": variables["full"].strip()} - - -def versions_from_vcs(tag_prefix, versionfile_source, verbose=False): - # this runs 'git' from the root of the source tree. That either means - # someone ran a setup.py command (and this code is in versioneer.py, so - # IN_LONG_VERSION_PY=False, thus the containing directory is the root of - # the source tree), or someone ran a project-specific entry point (and - # this code is in _version.py, so IN_LONG_VERSION_PY=True, thus the - # containing directory is somewhere deeper in the source tree). This only - # gets called if the git-archive 'subst' variables were *not* expanded, - # and _version.py hasn't already been rewritten with a short version - # string, meaning we're inside a checked out source tree. - - try: - here = os.path.abspath(__file__) - except NameError: - # some py2exe/bbfreeze/non-CPython implementations don't do __file__ - return {} # not always correct - - # versionfile_source is the relative path from the top of the source tree - # (where the .git directory might live) to this file. Invert this to find - # the root from __file__. - root = here - if IN_LONG_VERSION_PY: - for i in range(len(versionfile_source.split("/"))): - root = os.path.dirname(root) - else: - root = os.path.dirname(here) - if not os.path.exists(os.path.join(root, ".git")): - if verbose: - print("no .git in %s" % root) - return {} - - GIT = "git" - if sys.platform == "win32": - GIT = "git.cmd" - stdout = run_command([GIT, "describe", "--tags", "--dirty", "--always"], - cwd=root) - if stdout is None: - return {} - if not stdout.startswith(tag_prefix): - if verbose: - print("tag '%s' doesn't start with prefix '%s'" % - (stdout, tag_prefix)) - return {} - tag = stdout[len(tag_prefix):] - stdout = run_command([GIT, "rev-parse", "HEAD"], cwd=root) - if stdout is None: - return {} - full = stdout.strip() - if tag.endswith("-dirty"): - full += "-dirty" - return {"version": tag, "full": full} - - -def versions_from_parentdir(parentdir_prefix, versionfile_source, - verbose=False): - if IN_LONG_VERSION_PY: - # We're running from _version.py. If it's from a source tree - # (execute-in-place), we can work upwards to find the root of the - # tree, and then check the parent directory for a version string. If - # it's in an installed application, there's no hope. - try: - here = os.path.abspath(__file__) - except NameError: - # py2exe/bbfreeze/non-CPython don't have __file__ - return {} # without __file__, we have no hope - # versionfile_source is the relative path from the top of the source - # tree to _version.py. Invert this to find the root from __file__. - root = here - for i in range(len(versionfile_source.split("/"))): - root = os.path.dirname(root) - else: - # we're running from versioneer.py, which means we're running from - # the setup.py in a source tree. sys.argv[0] is setup.py in the root. - here = os.path.abspath(sys.argv[0]) - root = os.path.dirname(here) - - # Source tarballs conventionally unpack into a directory that includes - # both the project name and a version string. - dirname = os.path.basename(root) - if not dirname.startswith(parentdir_prefix): - if verbose: - print("guessing rootdir is '%s', but '%s' doesn't " - "start with prefix '%s'" % - (root, dirname, parentdir_prefix)) - return None - return {"version": dirname[len(parentdir_prefix):], "full": ""} - -tag_prefix = "" -parentdir_prefix = "leap-mail" -versionfile_source = "src/leap/mail/_version.py" - - -def get_versions(default={"version": "unknown", "full": ""}, verbose=False): - variables = {"refnames": git_refnames, "full": git_full} - ver = versions_from_expanded_variables(variables, tag_prefix, verbose) - if not ver: - ver = versions_from_vcs(tag_prefix, versionfile_source, verbose) - if not ver: - ver = versions_from_parentdir(parentdir_prefix, versionfile_source, - verbose) - if not ver: - ver = default - return ver +def get_versions(default={}, verbose=False): + return {'version': version_version, 'full': version_full} |