Merge lp:~chad.smith/lp2kanban/branch-to-card into lp:~launchpad/lp2kanban/trunk

[Chad Smith]

Add initial support for branch cards and taskboards. This branch only handles syncing and moving branch "MP/blue" cards on the Landscape 2016 board.

 Support was added for branch cards inside bugs2card because a lot of the logic is common and can hopefully be consolidated in a subsequent branch.

There will be a followup branch with added logic in bugs2cards to call moveToTaskBoard for feature cards that are manually dragged to the "$Group::Landed" lane.

src/lp2kanban/kanban.py:
- Define initial LeankitTaskBoard class
- Add optional CurrentTaskBoardId property to LeankitCard
- Add LeankitCard.moveToTaskBoard method to move a card as a subtask of another card
- Since Taskboard API calls live on a different route, rework API routes defined on the LeankitConnector class

src/lp2kanban/bugs2cards.py:
- _get_mp_info to handle non-bug branch records when parsing linked MPs
- should_sync_card to return true if external_system_url is a branch
- get_card_status returns proper status for cards that have external_system_urls linked but no bugs (external_system_id) linked
- add a loop to sync_board function which processes all "branch cards" through board.getCardsWithExternalLinks(only_branches=True)

config/sync.ini:
  - comment out [Landscape Cisco] board definition (as that should live in this board now

To test:
buildout
./bin/test
# to test against landscape 201
./create_creds.py (this will create your creds to modify the shared 2016 board)
Select "Change anything" button in your browser to allow updating cards

./bin/py src/lp2kanban/bugs2cards.py -c configs/sync.ini -b 'Landscape 2016'

# Tweak branches or drag cards at https://canonical.leankit.com/Boards/View/102392996#workflow-view that you want to see automatically moved back to the proper lanes.

What's lacking:
 unit tests to cover bugs2card sync_board (coming in a followup branch)

[Данило Шеган (danilo)]

Please re-submit this against lp:~landscape/lp2kanban/landscape-deploy.

review: Needs Resubmitting

[Данило Шеган (danilo)]

Note that I've also split out configs now since it was too easy to leak credentials (a bzr push in the lp2kanban namespace creates a public branch). Please review my drop-configs branch.

The kanban-sync job has been updated to use the new credentials (I've updated the password as well).

[lp:~chad.smith/lp2kanban/branch-to-card]

135. By Chad Smith on 2015-12-16

simplify moveToTaskBoard card method

136. By Chad Smith on 2015-12-16

merge ~landscape/lp2kanban/landscape-deploy to drop configs

137. By Chad Smith on 2015-12-16

address review comments: approved branches that have not yet been merged will remain in the status LANDING. update copyright.

138. By Chad Smith on 2015-12-16

fix has_branch conditional to first check if card.external_system_url is not None before trying to match BRANCH_REGEX

139. By Chad Smith on 2015-12-16

card.save needs to be taskboard aware. When calling UpdateCard the parent_board.id needs to be specified, not the taskboard.id

140. By Chad Smith on 2015-12-16

add parent_card param to LeankitTaskBoard so that we have a refernce to the taskboard's card on the parent_board. Use the parent_card for card path printing

141. By Chad Smith on 2015-12-16

merge landscape-deploy to get latest changes to jenkins.sh

142. By Chad Smith on 2015-12-17

revert test makefile change

Unmerged revisions

142. By Chad Smith on 2015-12-17

revert test makefile change

141. By Chad Smith on 2015-12-16

merge landscape-deploy to get latest changes to jenkins.sh

140. By Chad Smith on 2015-12-16

add parent_card param to LeankitTaskBoard so that we have a refernce to the taskboard's card on the parent_board. Use the parent_card for card path printing

139. By Chad Smith on 2015-12-16

card.save needs to be taskboard aware. When calling UpdateCard the parent_board.id needs to be specified, not the taskboard.id

138. By Chad Smith on 2015-12-16

fix has_branch conditional to first check if card.external_system_url is not None before trying to match BRANCH_REGEX

137. By Chad Smith on 2015-12-16

address review comments: approved branches that have not yet been merged will remain in the status LANDING. update copyright.

136. By Chad Smith on 2015-12-16

merge ~landscape/lp2kanban/landscape-deploy to drop configs

135. By Chad Smith on 2015-12-16

simplify moveToTaskBoard card method

134. By Chad Smith on 2015-12-16

process cards with linked branches in bugs2cards since a lot of the logic is common

133. By Chad Smith on 2015-12-16

landing_lanes == Dev::::Landed for config

=== modified file '.bzrignore'
--- .bzrignore	2012-09-15 18:20:28 +0000
+++ .bzrignore	2015-12-16 04:22:55 +0000
@@ -14,3 +14,4 @@
 .emacs.desktop
 credentials
 .emacs.desktop.lock
+logs/*
 
=== modified file 'Makefile'
--- Makefile	2013-03-18 15:45:56 +0000
+++ Makefile	2015-12-16 04:22:55 +0000
@@ -23,12 +23,12 @@
 
 
 bin/buildout: download-cache
-	$(PYTHON) bootstrap.py -v 1.7.0
+	$(PYTHON) bootstrap.py -v 1.7.1 -f eggs -c buildout.cfg
 	touch --no-create $@
 
 
 $(PY): bin/buildout $(BUILDOUT_CFG) setup.py
-	PYTHONPATH=. ./bin/buildout -c $(BUILDOUT_CFG)
+	./bin/buildout -c $(BUILDOUT_CFG)
 
 
 $(subst $(PY),,$(BUILDOUT_BIN)): $(PY)
 
=== added file 'README.landscape'
--- README.landscape	1970-01-01 00:00:00 +0000
+++ README.landscape	2015-12-16 04:22:55 +0000
@@ -0,0 +1,17 @@
+This branch is based off lp:~bjornt/lp2kanban/landscape and contains the
+configuration files needed for lp2kanban to process bugs for the Landscape
+project.
+
+To deploy, first run ./create_creds.py to create the credentials file. You
+should be logged into Launchpad as the lp2kanban user when doing this, unless
+for testing.
+
+Next you need to add cron entries to run the bugs2kanban.py script. You will
+need to run it twice, one for creating new bugs (create.ini) and one for
+syncing the card information with bugs (sync.ini):
+
+    bin/py src/lp2kanban/bugs2kanban.py -c create.ini
+    bin/py src/lp2kanban/bugs2kanban.py -c sync.ini
+
+The former is quite quick and can be run every minute. The latter is slower
+and shouldn't be run more often than every 5 minutes.
 
=== modified file 'bootstrap.py'
--- bootstrap.py	2013-03-18 15:45:56 +0000
+++ bootstrap.py	2015-12-16 04:22:55 +0000
@@ -18,7 +18,11 @@
 use the -c option to specify an alternate configuration file.
 """
 
-import os, shutil, sys, tempfile
+import os
+import shutil
+import sys
+import tempfile
+
 from optparse import OptionParser
 
 tmpeggs = tempfile.mkdtemp()
@@ -31,8 +35,8 @@
 Simply run this script in a directory containing a buildout.cfg, using the
 Python that you want bin/buildout to use.
 
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
+Note that by using --find-links to point to local resources, you can keep
+this script from going over the network.
 '''
 
 parser = OptionParser(usage=usage)
@@ -48,48 +52,63 @@
                         "bootstrap and buildout will get the newest releases "
                         "even if they are alphas or betas."))
 parser.add_option("-c", "--config-file",
-                   help=("Specify the path to the buildout configuration "
-                         "file to be used."))
+                  help=("Specify the path to the buildout configuration "
+                        "file to be used."))
 parser.add_option("-f", "--find-links",
-                   help=("Specify a URL to search for buildout releases"))
+                  help=("Specify a URL to search for buildout releases"))
+parser.add_option("--allow-site-packages",
+                  action="store_true", default=False,
+                  help=("Let bootstrap.py use existing site packages"))
+parser.add_option("--setuptools-version",
+                  help="use a specific setuptools version")
 
 
 options, args = parser.parse_args()
 
 ######################################################################
-# load/install distribute
+# load/install setuptools
 
-to_reload = False
 try:
-    import pkg_resources, setuptools
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        raise ImportError
+    if options.allow_site_packages:
+        import setuptools
+        import pkg_resources
+    from urllib.request import urlopen
 except ImportError:
-    ez = {}
-
-    try:
-        from urllib.request import urlopen
-    except ImportError:
-        from urllib2 import urlopen
-
-    exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
-    setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
-    ez['use_setuptools'](**setup_args)
-
-    if to_reload:
-        reload(pkg_resources)
-    import pkg_resources
-    # This does not (always?) update the default working set.  We will
-    # do it.
-    for path in sys.path:
-        if path not in pkg_resources.working_set.entries:
-            pkg_resources.working_set.add_entry(path)
+    from urllib2 import urlopen
+
+ez = {}
+exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
+
+if not options.allow_site_packages:
+    # ez_setup imports site, which adds site packages
+    # this will remove them from the path to ensure that incompatible versions
+    # of setuptools are not in the path
+    import site
+    # inside a virtualenv, there is no 'getsitepackages'.
+    # We can't remove these reliably
+    if hasattr(site, 'getsitepackages'):
+        for sitepackage_path in site.getsitepackages():
+            sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
+
+setup_args = dict(to_dir=tmpeggs, download_delay=0)
+
+if options.setuptools_version is not None:
+    setup_args['version'] = options.setuptools_version
+
+ez['use_setuptools'](**setup_args)
+import setuptools
+import pkg_resources
+
+# This does not (always?) update the default working set.  We will
+# do it.
+for path in sys.path:
+    if path not in pkg_resources.working_set.entries:
+        pkg_resources.working_set.add_entry(path)
 
 ######################################################################
 # Install buildout
 
-ws  = pkg_resources.working_set
+ws = pkg_resources.working_set
 
 cmd = [sys.executable, '-c',
        'from setuptools.command.easy_install import main; main()',
@@ -104,8 +123,8 @@
 if find_links:
     cmd.extend(['-f', find_links])
 
-distribute_path = ws.find(
-    pkg_resources.Requirement.parse('distribute')).location
+setuptools_path = ws.find(
+    pkg_resources.Requirement.parse('setuptools')).location
 
 requirement = 'zc.buildout'
 version = options.version
@@ -113,13 +132,19 @@
     # Figure out the most recent final version of zc.buildout.
     import setuptools.package_index
     _final_parts = '*final-', '*final'
+
     def _final_version(parsed_version):
-        for part in parsed_version:
-            if (part[:1] == '*') and (part not in _final_parts):
-                return False
-        return True
+        try:
+            return not parsed_version.is_prerelease
+        except AttributeError:
+            # Older setuptools
+            for part in parsed_version:
+                if (part[:1] == '*') and (part not in _final_parts):
+                    return False
+            return True
+
     index = setuptools.package_index.PackageIndex(
-        search_path=[distribute_path])
+        search_path=[setuptools_path])
     if find_links:
         index.add_find_links((find_links,))
     req = pkg_resources.Requirement.parse(requirement)
@@ -142,10 +167,9 @@
 cmd.append(requirement)
 
 import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
     raise Exception(
-        "Failed to execute command:\n%s",
-        repr(cmd)[1:-1])
+        "Failed to execute command:\n%s" % repr(cmd)[1:-1])
 
 ######################################################################
 # Import and run buildout
 
=== modified file 'buildout.cfg'
--- buildout.cfg	2013-06-19 19:44:20 +0000
+++ buildout.cfg	2015-12-16 04:22:55 +0000
@@ -11,6 +11,7 @@
 exec-sitecustomize = true
 develop = .
 eggs-directory = eggs
+offline = false
 
 [test]
 recipe = zc.recipe.testrunner
@@ -38,13 +39,12 @@
 lazr.restfulclient = 0.11.2
 lazr.uri = 1.0.2
 oauth = 1.0.1
-setuptools = 0.6c11
 simplejson = 2.1.6
 wadllib = 1.2.0
 wsgi-intercept = 0.5.0
 z3c.recipe.scripts = 1.0.1
 z3c.recipe.tag = 0.4.0
-zc.buildout = 1.5.2
+zc.buildout = 1.7.1
 zc.recipe.egg = 1.3.2
 zc.recipe.testrunner = 1.4.0
 zope.exceptions = 3.6.1
 
=== added directory 'configs'
=== added file 'configs/groups.ini'
--- configs/groups.ini	1970-01-01 00:00:00 +0000
+++ configs/groups.ini	2015-12-16 04:22:55 +0000
@@ -0,0 +1,16 @@
+# The group name, which will replace ${group} in lane configs.
+# The Launchpad account names of the group members.
+[Alpha]
+members = benji,simpoir
+[Beta]
+members = fcorrea,chad.smith
+[Gamma]
+members = adam-collard,bogdana
+[Delta]
+members = tealeg,danilo
+[Epsilon]
+members = free.ekanayaka,ack
+[Zeta]
+members = bjornt,tribaal
+[QA]
+members = ahasenack
 
=== added file 'configs/sync.ini'
--- configs/sync.ini	1970-01-01 00:00:00 +0000
+++ configs/sync.ini	2015-12-16 04:22:55 +0000
@@ -0,0 +1,106 @@
+[GLOBAL]
+# This is the account part of https://<account>.leankitkanban.com/ URL.
+account = canonical
+# LeankitKanban user name and password.
+user = [e-mail]
+password = fShv0K4h@LV:!{
+
+# Defaults are common values overridable in each of the boards definition.
+[DEFAULT]
+lp_server = production
+launchpadlib_dir = .launchpadlib.create
+
+# Should all cards with external IDs be synced or not.  Set to 'on' if
+# you want them synced automatically (and use "(no-sync)" as the marker
+# for cards you don't want synced).
+autosync = on
+
+# Should the cards be moved?  If not specified it is off.
+move_cards = on
+
+# Should the cards be synced?  If not specified it is off.
+sync_cards = on
+
+# Bug tag for which new cards should be created. If a bug in Launchpad
+# has this tag, a new card will be created for it in the first kanban lane.
+# If this config option isn't set, no cards will be created.
+# After the card has been created, the tag will be removed from the bug, so a
+# credentials_file has to be specified as well, to authenticate against LP.
+bug_to_card_tag = kanban
+
+# Which card type should cards created from bugs have. If not set, the default
+# card type is used.
+bug_to_card_type = Bug
+
+bug_to_card_lane = Backlog
+
+# By default, omnidirectional card moves are off, which means that cards will
+# be moved only to the lane that is considered to be next of the card's
+# current lane. I.e. a card will move only within a "swim lane". If
+# omnidirectional card moves are turned on, a card can move to any lane
+# on the board.
+omnidirectional_card_moves = on
+
+# Lanes are assigned a "role" by looking for sublanes matching
+# values given here.  "Coding" will match all lanes which have
+# a title of "Coding", and "QA::Ready" will match all lanes
+# titled "Ready" that have a parent lane with title "QA".
+#
+# Note that bugs2cards.py analyzes the lane structure and will flow
+# cards only within the same horizontal "lane" (iow, if you have
+# parallel 'Feature' and 'Bugs' development lanes, cards will flow
+# only from Coding -> Review inside them, and then will move to the
+# next lane horizontally (eg. Landing lane).
+#coding_lanes =
+#review_lanes =
+#landing_lanes =
+#qa_lanes =
+#deploy_lanes =
+#downtime_deploy_lanes =
+#done_lanes =
+
+
+# If you track multiple groups of people on one board, you can specify a
+# groups config that will map a card to a group according to its
+#assignee.  You can then make the lane configs to include the group
+# name, by using ${group} in the lane name. For example:
+#
+#     coding_lanes = ${group}::Coding
+#
+groups_config_file = ./configs/groups.ini
+
+credentials_file = ./credentials
+
+
+#[Landscape Cisco]
+# Keep [Landscape Cisco] board before [Landscape] so it gets the "falkor" cards
+# (we can only use external ID for one card across all of Leankit).
+#projects = falkor
+
+#bug_to_card_lane = Backlog
+
+#coding_lanes = Doing
+#review_lanes = Doing
+#landing_lanes = Done
+#deploy_lanes = Done
+#done_lanes = Done
+
+#no_move_lanes =
+#no_sync_lanes =
+
+
+[Landscape 2016]
+project_group = landscape-project
+
+# TODO: This should put charm bugs in ::Charm and server/client bugs
+# in ::Landscape, for now stick everything in ::Landscape
+bug_to_card_lane = Backlog::Engineering
+
+coding_lanes = Development::${group}::Doing
+review_lanes = Development::${group}::Review
+landing_lanes = Development::${group}::Landed
+deploy_lanes = QA::Landed
+done_lanes = Done
+
+no_move_lanes = Done,QA::Landed,QA::In progress
+no_sync_lanes = Backlog::Engineering,Done,QA::Landed,QA::In progress,Archive,Ready for QA,Release Ready,Staging,Production,LDS
 
=== modified file 'create_creds.py'
--- create_creds.py	2012-12-10 15:21:44 +0000
+++ create_creds.py	2015-12-16 04:22:55 +0000
@@ -7,7 +7,7 @@
 
 web_root="https://launchpad.net/"
 
-creds = Credentials("tarmac")
+creds = Credentials("lp2kanban-landscape")
 url = creds.get_request_token(web_root=web_root)
 
 subprocess.call(['xdg-open', url])
 
=== added file 'jenkins.sh'
--- jenkins.sh	1970-01-01 00:00:00 +0000
+++ jenkins.sh	2015-12-16 04:22:55 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash -xe
+
+ini="$1.ini"
+date "+START: %c"
+
+#export https_proxy=http://squid.external:3128
+#export http_proxy=http://squid.external:3128
+
+make 
+
+if [ ! -e credentials ]; then
+    if [ -e ~/credentials ]; then
+        cp ~/credentials credentials
+    else
+        echo "ERROR: try make credentials first!"
+        exit 1
+    fi
+fi
+
+# default encoding of stdout/stderr when not attached to a terminal is set to
+# 'None'.  'PYTHONIOENCODING' overrides, could also be overridden in the
+# python program by modifying 'sys.stdout.encoding' directly.  This feels
+# cleaner.  Note setting LANG (which the terminal respects) wont fix this,
+# since there is no terminal attached.
+# --------
+# See:
+# - https://wiki.python.org/moin/PrintFails
+# - https://stackoverflow.com/questions/1473577
+# - https://stackoverflow.com/questions/492483
+# - https://stackoverflow.com/questions/9932406
+PYTHONIOENCODING="utf-8" bin/py src/lp2kanban/bugs2cards.py -c configs/${1}.ini
+date "+END: %c"
 
=== added directory 'logs'
=== added file 'run.sh'
--- run.sh	1970-01-01 00:00:00 +0000
+++ run.sh	2015-12-16 04:22:55 +0000
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+LOGFILE="logs/${1}-`date '+%Y-%m-%d'`.log"
+LOCKFILE="$HOME/lp2kanban/run-$1.lock"
+exit_status=0
+export https_proxy=http://squid.external:3128
+
+cd $HOME/lp2kanban
+echo -n "START " >> $LOGFILE
+date "+%c" >> $LOGFILE
+lockfile -10 -r 4 $LOCKFILE
+if [ "$?" -eq 0 ]; then
+    bin/py src/lp2kanban/bugs2cards.py -c configs/${1}.ini 2>&1 >> $LOGFILE
+    exit_status=$?
+    rm -f $LOCKFILE
+else
+    echo "Failed to grab lockfile $LOCKFILE" >> $LOGFILE
+    exit_status=1
+fi
+echo -n "END " >> $LOGFILE; date "+%c" >> $LOGFILE
+exit $?
 
=== modified file 'src/lp2kanban/bugs2cards.py'
--- src/lp2kanban/bugs2cards.py	2013-06-19 19:44:20 +0000
+++ src/lp2kanban/bugs2cards.py	2015-12-16 04:22:55 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011 Canonical Ltd
+# Copyright 2015 Canonical Ltd
 #
 from ConfigParser import ConfigParser
 from argparse import ArgumentParser
@@ -9,6 +9,7 @@
     update_blueprints_from_work_items,
     )
 from lp2kanban.kanban import (
+    BRANCH_REGEX,
     LeankitKanban,
     Record,
     )
@@ -117,6 +118,9 @@
         for user in board.users:
             lp_user = lp.people.getByEmail(email=user)
             if lp_user is None:
+                print (
+                    "WARNING: There is no matching Launchpad user for kanban"
+                    " user %s." % (user,))
                 continue
             self.lp_to_kanban[lp_user.name] = board.users[user]
             self.kanban_to_lp[board.users[user]] = lp_user
@@ -161,8 +165,10 @@
 
     def _get_mp_info():
         mps = []
-        for bug_branch in branches:
-            for mp in bug_branch.branch.landing_targets:
+        for branch in branches:
+            if hasattr(branch, 'branch') :
+                branch = branch.branch
+            for mp in branch.landing_targets:
                 mp_info = Record(rank=None, status=None, mp=None)
                 status = mp.queue_status
                 mp_info.rank = ORDERED_STATUSES.get(status, 1)
@@ -222,8 +228,10 @@
     if conf.get('autosync', None) == 'on':
         has_id = (card.external_card_id is not None and
                   card.external_card_id.strip() != '')
-        return (has_id and NO_SYNC_MARKER not in card.title and
-                NO_SYNC_MARKER not in card.description)
+        has_branch = BRANCH_REGEX.match(card.external_system_url)
+        if NO_SYNC_MARKER in card.title or NO_SYNC_MARKER in card.description:
+            return False
+        return (has_id or has_branch)
     else:
         return (card.title.startswith(TITLE_MARKER) or
                 DESCRIPTION_MARKER in card.description)
@@ -296,15 +304,21 @@
     """Return the status of the card as one of CardStatus values."""
     # status of None means card needs not to be moved.
     status = None
-    if bug_status in IN_PROGRESS_BUG_STATUSES:
-        status = CardStatus.CODING
+    branch_card_status = None
+    if branch_info:
         if branch_info.status == 'In Progress':
-            status = CardStatus.CODING
+            branch_card_status = CardStatus.CODING
         elif branch_info.status == 'In Review':
-            status = CardStatus.REVIEW
+            branch_card_status = CardStatus.REVIEW
         elif branch_info.status == 'Approved':
-            status = CardStatus.LANDING
+            branch_card_status = CardStatus.LANDING
         elif branch_info.status == 'Merged':
+            branch_card_status = CardStatus.LANDING
+        if bug_status is None:
+            return branch_card_status
+    if bug_status in IN_PROGRESS_BUG_STATUSES:
+        status = CardStatus.CODING
+        if branch_info.status == 'Merged':
             if bug_status == 'Fix Committed':
                 if 'qa-needstesting' in bug_tags:
                     status = CardStatus.QA
@@ -315,6 +329,8 @@
                         status = CardStatus.DEPLOY
             else:
                 status = CardStatus.LANDING
+        elif branch_card_status:
+            return branch_card_status
     elif bug_status in DONE_BUG_STATUSES:
         status = CardStatus.DONE
     return status
@@ -454,6 +470,37 @@
                 board, project, new_bug_tag, bconf.get("bug_to_card_type"),
                 bconf.get("bug_to_card_lane"))
     print "   Syncing cards:"
+    # Process linked branch cards
+    for card in board.getCardsWithExternalLinks(only_branches=True):
+        if card.external_card_id:
+            # Cards with external_id are processed by getCardsWithExternalIds
+            continue
+        branch_name = card.external_system_url.replace(
+            "https://code.launchpad.net/", "")
+        branch = lp.branches.getByUniqueName(unique_name=branch_name)
+        if not branch:
+            print "Invalid branch url ({}) for card '{}'".format(
+                card.external_system_url, card.title)
+            continue
+        if should_sync_card(card, bconf):
+            branch_info = get_branch_info([branch])
+            owner_name = BRANCH_REGEX.match(card.external_system_url).group(1)
+            card_status = get_card_status(None, '', branch_info)
+            if branch_info.status and should_move_card(card, bconf):
+                assignee = Record(name=owner_name)
+                try:
+                    move_card(card, card_status, bconf, [assignee], lp_users)
+                except IOError as e:
+                    print "   * %s (in %s)" % (card.title, card.lane.path)
+                    print "     >>> Error moving card:"
+                    print "     ", e
+                    continue
+                kanban_user = lp_users.lp_to_kanban.get(assignee.name, None)
+                if kanban_user:
+                    card.assigned_user_id = kanban_user.id
+                    card.kanban_user = kanban_user
+                print "   * %s (in %s)" % (card.title, card.lane.path)
+
     for card in board.getCardsWithExternalIds():
         if should_sync_card(card, bconf):
             try:
 
=== modified file 'src/lp2kanban/kanban.py'
--- src/lp2kanban/kanban.py	2013-05-24 14:48:07 +0000
+++ src/lp2kanban/kanban.py	2015-12-16 04:22:55 +0000
@@ -11,6 +11,8 @@
 
 
 ANNOTATION_REGEX = re.compile('^\s*{.*}\s*$', re.MULTILINE|re.DOTALL)
+BRANCH_REGEX = re.compile(
+    '^https://code.launchpad.net/~([.\w]*)/([-\w]*)/([-\w]*)$')
 
 
 class Record(dict):
@@ -55,8 +57,7 @@
 
 class LeankitConnector(object):
     def __init__(self, account, username=None, password=None, throttle=1):
-        host = 'https://' + account + '.leankitkanban.com'
-        self.base_api_url = host + '/Kanban/Api'
+        self.base_api_url = 'https://' + account + '.leankit.com'
         self.http = self._configure_auth(username, password)
         self.last_request_time = time.time() - throttle
         self.throttle = throttle
@@ -97,6 +98,10 @@
                 config={},
                 return_response=False)
             sent = request.send()
+        except AttributeError as e:
+            # Weirdly, httplib2 has a habit of throwing an AttributeError
+            # when it can't connect, so we handle that nicely.
+            raise IOError("Unable to connect to LeanKitKanban server.")
         except Exception as e:
             raise IOError("Unable to make HTTP request: %s" % e.message)
 
@@ -193,14 +198,17 @@
     optional_attributes = [
         'ExternalCardID', 'AssignedUserId', 'Size', 'IsBlocked',
         'BlockReason', 'ExternalSystemName', 'ExternalSystemUrl',
-        'ClassOfServiceId', 'DueDate',
+        'ClassOfServiceId', 'DueDate', 'CurrentTaskBoardId'
         ]
 
     def __init__(self, card_dict, lane):
         super(LeankitCard, self).__init__(card_dict)
 
         self.lane = lane
-        self.tags_list = set([tag.strip() for tag in self.tags.split(',')])
+        if not self.tags:
+            self.tags_list = []
+        else:
+            self.tags_list = set([tag.strip() for tag in self.tags.split(',')])
         if '' in self.tags_list:
             self.tags_list.remove('')
         self.type = lane.board.cardtypes[self.type_id]
@@ -214,7 +222,7 @@
         tag = tag.strip()
         if tag not in self.tags_list or self.tags.startswith(','):
             if tag != '':
-                self.tags_list.add(tag)
+                self.tags_list.append(tag)
             self.tags = ', '.join(self.tags_list)
 
     def save(self):
@@ -241,10 +249,12 @@
             del data['Id']
             del data['LaneId']
             position = len(self.lane.cards)
-            url_parts = ['/Board', str(self.lane.board.id), 'AddCard',
-                         'Lane', str(self.lane.id), 'Position', str(position)]
+            url_parts = ['/Kanban/Api/Board', str(self.lane.board.id),
+                         'AddCard', 'Lane', str(self.lane.id),
+                         'Position', str(position)]
         else:
-            url_parts = ['/Board', str(self.lane.board.id), 'UpdateCard']
+            url_parts = ['/Kanban/Api/Board', str(self.lane.board.id),
+                         'UpdateCard']
 
         url = '/'.join(url_parts)
 
@@ -267,9 +277,23 @@
         else:
             return None
 
+    def moveToTaskBoard(self, parent_board, target_card):
+        url = '/Api/Card/MoveCardToTaskboard'
+        result = self.lane.board.connector.post(url, data={
+            'boardId': parent_board.id,
+            'destCardId': target_card.id,
+            'srcCardId': [self.id]})
+        if result.ReplyCode in LeankitResponseCodes.SUCCESS_CODES:
+            return result.ReplyData[0]
+        else:
+            raise Exception(
+                "Moving card %s (%s) to %s failed. " % (
+                   self.title, self.id, self.lane.path) +
+                "Error %s: %s" % (result.ReplyCode, result.ReplyText))
+
     def _moveCard(self):
         target_pos = len(self.lane.cards)
-        url = '/Board/%d/MoveCard/%d/Lane/%d/Position/%d' % (
+        url = '/Kanban/Api/Board/%d/MoveCard/%d/Lane/%d/Position/%d' % (
             self.lane.board.id, self.id, self.lane.id, target_pos)
         result = self.lane.board.connector.post(url, data=None)
         if result.ReplyCode in LeankitResponseCodes.SUCCESS_CODES:
@@ -323,6 +347,8 @@
                  text_after_json), where json_annotations contains the
                  JSON loaded with json.loads().
         """
+        if not self.description:
+            self.description = ""
         match = ANNOTATION_REGEX.search(self.description)
         if match:
             start = match.start()
@@ -330,7 +356,7 @@
             try:
                 annotations = Record(json.loads(self.description[start:end]))
             except ValueError, ex:
-                print "Unable to parse card %i: %s" % (self.id, ex.message)
+                print "Unable to parse card %s: %s" % (self.id, ex.message)
                 annotations = Record()
             return (
                 annotations,
@@ -450,7 +476,7 @@
 
     attributes = ['Id', 'Title', 'CreationDate', 'IsArchived']
 
-    base_uri = '/Boards/'
+    base_uri = '/Kanban/Api/Boards/'
 
     def __init__(self, board_dict, connector):
         super(LeankitBoard, self).__init__(board_dict)
@@ -469,12 +495,20 @@
         self._cards_with_external_ids = set()
         self._cards_with_description_annotations = set()
         self._cards_with_external_links = set()
+        self._cards_with_branches = set()
         self.default_cardtype = None
 
     def getCardsWithExternalIds(self):
         return self._cards_with_external_ids
 
-    def getCardsWithExternalLinks(self):
+    def getCardsWithExternalLinks(self, only_branches=False):
+        """Return cards with external links
+
+        @param only_merge_proposals: Only return cards that have merge
+            proposals specified as the card's external link
+        """
+        if only_branches:
+            return self._cards_with_branches
         return self._cards_with_external_links
 
     def getCardsWithDescriptionAnnotations(self):
@@ -487,15 +521,23 @@
         self._populateUsers(self.details['BoardUsers'])
         self._populateCardTypes(self.details['CardTypes'])
         self._archive = self.connector.get(
-            "/Board/" + str(self.id) + "/Archive").ReplyData[0]
+            "/Kanban/Api/Board/" + str(self.id) + "/Archive").ReplyData[0]
         archive_lanes = [lane_dict['Lane'] for lane_dict in self._archive]
         archive_lanes.extend(
             [lane_dict['Lane'] for
             lane_dict in self._archive[0]['ChildLanes']])
         self._backlog = self.connector.get(
-            "/Board/" + str(self.id) + "/Backlog").ReplyData[0]
+            "/Kanban/Api/Board/" + str(self.id) + "/Backlog").ReplyData[0]
         self._populateLanes(
             self.details['Lanes'] + archive_lanes + self._backlog)
+        for card in self.cards:
+            if card.current_task_board_id:  # We are a task board
+                taskboard_data = self.connector.get(
+                    "/Kanban/Api/v1/board/%s/card/%s/taskboard" % (self.id, card.id))
+                card.taskboard = LeankitTaskBoard(
+                    taskboard_data["ReplyData"][0], self)
+                card.taskboard.fetchDetails()
+                self.cards.extend(card.taskboard.cards)
         self._classifyCards()
 
     def _classifyCards(self):
@@ -508,12 +550,16 @@
                 self._cards_with_description_annotations.add(card)
             if card.external_system_url:
                 self._cards_with_external_links.add(card)
+                if BRANCH_REGEX.match(card.external_system_url):
+                    self._cards_with_branches.add(card)
         print "   - %s cards with external ids" % len(
             self._cards_with_external_ids)
         print "   - %s cards with external links" % len(
             self._cards_with_external_links)
         print "   - %s cards with description annotations" % len(
             self._cards_with_description_annotations)
+        print "   - %s cards with branches" % len(
+            self._cards_with_branches)
 
     def _populateUsers(self, user_data):
         self.users = {}
@@ -625,6 +671,21 @@
             self._printLanes(lane, indent, include_cards)
 
 
+class LeankitTaskBoard(LeankitBoard):
+
+    attributes = ['Id', 'Title']
+
+    def __init__(self, taskboard_dict, board):
+        super(LeankitTaskBoard, self).__init__(taskboard_dict, board.connector)
+        self.base_uri = '/Api/Board/%d/TaskBoard/%s/Get' % (board.id, self.id)
+        self.cardtypes = board.cardtypes
+        self.parent_board = board
+
+    def fetchDetails(self):
+        self.details = self.connector.get(self.base_uri).ReplyData[0]
+        self._populateLanes(self.details['Lanes'])
+
+
 class LeankitKanban(object):
 
     def __init__(self, account, username=None, password=None):
@@ -638,7 +699,7 @@
 
         :param include_archived: if True, include archived boards as well.
         """
-        boards_data = self.connector.get('/Boards').ReplyData
+        boards_data = self.connector.get('/Kanban/Api/Boards').ReplyData
         boards = []
         for board_dict in boards_data[0]:
             board = LeankitBoard(board_dict, self.connector)
@@ -683,13 +744,14 @@
 if __name__ == '__main__':
     kanban = LeankitKanban('launchpad.leankitkanban.com',
                            'user@email', 'password')
+
     print "Active boards:"
     boards = kanban.getBoards()
     for board in boards:
         print " * %s (%d)" % (board.title, board.id)
 
     # Get a board by the title.
-    board_name = 'lp2kanban test'
+    board_name = 'Landscape 2016'
     print "Getting board '%s'..." % board_name
     board = kanban.getBoard(title=board_name)
     board.printLanes()
 
=== modified file 'src/lp2kanban/tests/common.py'
--- src/lp2kanban/tests/common.py	2013-04-08 12:46:05 +0000
+++ src/lp2kanban/tests/common.py	2015-12-16 04:22:55 +0000
@@ -33,13 +33,16 @@
         self.is_archived = is_archived
         self._cards_with_description_annotations = set()
         self._cards_with_external_links = set()
+        self._cards_with_branches = set()
         self.lanes = {}
         self.root_lane = self.addLane('ROOT LANE')
 
     def getCardsWithDescriptionAnnotations(self):
         return self._cards_with_description_annotations
 
-    def getCardsWithExternalLinks(self):
+    def getCardsWithExternalLinks(self, only_branches=False):
+        if only_branches:
+            return self._cards_with_branches
         return self._cards_with_external_links
 
     def getLaneByPath(self, path):
@@ -93,7 +96,7 @@
     def __init__(self, external_card_id=None, title=u"", description=u"",
                  description_annotations=None, lane=None,
                  assigned_user_id=None, external_system_name=None,
-                 external_system_url=None):
+                 external_system_url=u""):
         self.external_card_id = external_card_id
         self.title = title
         self.description = description
 
=== modified file 'src/lp2kanban/tests/test_bugs2cards.py'
--- src/lp2kanban/tests/test_bugs2cards.py	2013-04-08 12:50:46 +0000
+++ src/lp2kanban/tests/test_bugs2cards.py	2015-12-16 04:22:55 +0000
@@ -346,6 +346,7 @@
         # in CODING.
         self.assertEqual(CardStatus.CODING, status)
 
+BRANCH_URL = "https://code.launchpad.net/~me/project/branch-name"
 
 class CardStatusTest(unittest.TestCase):
 
@@ -375,23 +376,43 @@
 
     def test_should_sync_card_autosync_no(self):
         # When autosync is 'on', cards with no external card IDs
-        # are not synced.
+        # and no branches are not synced.
         card = Record(title=u'no sync', description=u'',
-                      external_card_id=None)
+                      external_card_id=None, external_system_url=None)
         self.assertFalse(should_sync_card(card, {'sync_cards': 'on'}))
 
-    def test_should_sync_card_autosync_yes(self):
+    def test_should_sync_card_autosync_no_sync_with_non_branch_urls(self):
+        # When autosync is 'on', cards with external_system_urls which are not
+        # valid launchpad branches are not synced.
+        non_branch_urls = [
+            "http://www.google.com/",
+            "https://bugs.launchpad.net/charms/+source/hacluster/+bug/1",
+            "https://code.launchpad.net/~person/project/blah/+merge/111"
+        ]
+        for url in non_branch_urls:
+            card = Record(title=u'no sync', description=u'',
+                          external_card_id=None, external_system_url=url)
+            self.assertFalse(should_sync_card(card, {'sync_cards': 'on'}))
+
+    def test_should_sync_card_autosync_synced_with_external_card_id(self):
         # When autosync is 'on', cards with external card IDs are synced.
         card = Record(title=u'no sync', description=u'',
-                      external_card_id='11')
+                      external_card_id=u'11', external_system_url=u'')
+        self.assertTrue(should_sync_card(card, {'autosync': 'on',
+                                                'sync_cards': 'on'}))
+
+    def test_should_sync_card_autosync_synced_with_branch(self):
+        # When autosync is 'on', cards with a valid branch are synced.
+        card = Record(title=u'no sync', description=u'',
+                      external_card_id=u'11', external_system_url=BRANCH_URL)
         self.assertTrue(should_sync_card(card, {'autosync': 'on',
                                                 'sync_cards': 'on'}))
 
     def test_should_sync_card_autosync_nosync(self):
-        # When autosync is 'on', cards with external card IDs are not
-        # synced when they contain the no-sync marker.
+        # When autosync is 'on', cards with external card IDs or a valid
+        # branch are not synced when they contain the no-sync marker.
         card = Record(title=u'(no-sync)', description=u'(no-sync)',
-                      external_card_id='11')
+                      external_card_id=u'11', external_system_url=BRANCH_URL)
         self.assertFalse(should_sync_card(card, {'autosync': 'on',
                                                  'sync_cards': 'on'}))
 
@@ -452,7 +473,7 @@
         self.assertFalse(should_sync_card(card1, conf))
         self.assertFalse(should_sync_card(card2, conf))
 
-    def test_get_card_status_noop(self):
+    def test_get_card_status_noop_no_branch(self):
         # For a bug in 'New', 'Triaged', 'Confirmed' or 'Incomplete' statuses,
         # the status is unknown.
         self.assertEqual(None, get_card_status('New', [], None))
@@ -460,6 +481,33 @@
         self.assertEqual(None, get_card_status('Incomplete', [], None))
         self.assertEqual(None, get_card_status('Triaged', [], None))
 
+    def test_get_card_status_coding_no_bug(self):
+        # For a card with no associated bug, an in progress branch status will
+        # be in the coding state. 
+        branch_info = Record(status='In Progress', target=None)
+        self.assertEqual(
+            CardStatus.CODING, 
+            get_card_status(None, [], branch_info))
+
+    def test_get_card_status_review_no_bug(self):
+        # For a card with no associated bug, an in review branch status will
+        # be in the review state. 
+        branch_info = Record(status='In Review', target=None)
+        self.assertEqual(
+            CardStatus.REVIEW, 
+            get_card_status(None, [], branch_info))
+
+    def test_get_card_status_landing_no_bug(self):
+        # For a card with no associated bug, an approved or merged branch
+        # status will be in the landing state. 
+        branch_infos = [
+            Record(status='Approved', target=None),
+            Record(status='Merged', target=None)]
+        for branch_info in branch_infos:
+            self.assertEqual(
+                CardStatus.LANDING, 
+                get_card_status(None, [], branch_info))
+
     def test_get_card_status_coding_no_branch(self):
         # For a bug in 'In Progress' or 'Fix Committed' status, it is
         # considered to be in the coding state if there is no branch.