Merge lp:~nataliabidart/magicicada-client/use-protocol-from-wheel into lp:magicicada-client

[Natalia Bidart]

- Use protocol from wheel release.
- Fix copyright headers from modified files.

[Facundo Batista (facundo)]

Rock!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2016-10-24 20:59:39 +0000
+++ .bzrignore	2018-04-14 23:49:33 +0000
@@ -14,4 +14,3 @@
 .protocol
 clientdefs.py
 logging.conf
-ubuntuone/storageprotocol
 
=== removed file '.coveragerc'
--- .coveragerc	2010-04-30 14:30:34 +0000
+++ .coveragerc	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# .coveragerc to control coverage.py
-[run]
-branch = True
-
-[report]
-# Regexes for lines to exclude from consideration
-exclude_lines =
-    # Have to re-enable the standard pragma
-    pragma: no cover
-
-    # Don't complain about missing debug-only code:
-    def __repr__
-    if self\.debug
-
-    # Don't complain if tests don't hit defensive assertion code:
-    raise AssertionError
-    raise NotImplementedError
-
-    # Don't complain if non-runnable code isn't run:
-    if 0:
-    if __name__ == .__main__.:
-
-ignore_errors = True
-
-omit =
-    /usr
-    tests
 
=== modified file 'HACKING'
--- HACKING	2018-03-08 18:32:01 +0000
+++ HACKING	2018-04-14 23:49:33 +0000
@@ -1,9 +1,5 @@
-In order to run tests in ubuntuone-client, you will need to have a built
-version of ubuntuone-storage-protocol in a tree, or installed. You can
-specify the path to a built tree with the --with-protocol option to configure,
-or autogen.sh (which calls configure after creating it).
-
-Or you can simply bootstrap and everything will happen automagically:
+In order to run tests in ubuntuone-client, you can simply bootstrap and
+everything will be setup automagically:
 
 $: sudo apt-get install make
 $: make bootstrap
 
=== modified file 'Makefile'
--- Makefile	2018-03-25 11:12:10 +0000
+++ Makefile	2018-04-14 23:49:33 +0000
@@ -28,31 +28,19 @@
 # For further info, check  http://launchpad.net/magicicada-client
 
 ENV = $(CURDIR)/.env
-PROTOCOL_DIR = $(CURDIR)/.protocol
-PROTOCOL_LINK = ubuntuone/storageprotocol
 
 deps:
 	cat dependencies.txt | sudo xargs apt-get install -y --no-install-recommends
 	cat dependencies-devel.txt | sudo xargs apt-get install -y --no-install-recommends
 
-$(PROTOCOL_DIR):
-	bzr branch lp:magicicada-protocol $(PROTOCOL_DIR)
-
-$(PROTOCOL_LINK): $(PROTOCOL_DIR)
-	ln -s $(PROTOCOL_DIR)/$(PROTOCOL_LINK) $(PROTOCOL_LINK)
-
-update-protocol:
-	cd $(PROTOCOL_DIR) && bzr pull && python setup.py build
-
 build:
 	$(ENV)/bin/python setup.py build
 
-bootstrap: deps $(PROTOCOL_DIR) $(PROTOCOL_LINK) update-protocol venv build
+bootstrap: deps venv build
 
 docker-bootstrap: clean
 	cat dependencies.txt | xargs apt-get install -y --no-install-recommends
 	cat dependencies-devel.txt | xargs apt-get install -y --no-install-recommends
-	$(MAKE) $(PROTOCOL_DIR) $(PROTOCOL_LINK) update-protocol
 
 venv: 
 	virtualenv --system-site-packages $(ENV)
@@ -65,8 +53,8 @@
 	./run-tests
 
 clean:
-	rm -rf build _trial_temp $(PROTOCOL_DIR) $(PROTOCOL_LINK) $(ENV)
+	rm -rf build _trial_temp $(ENV)
 	find -name '*.pyc' -delete
 
 .PHONY:
-	deps update-protocol bootstrap lint test clean
+	deps bootstrap lint test clean
 
=== modified file 'dependencies.txt'
--- dependencies.txt	2018-03-14 21:01:56 +0000
+++ dependencies.txt	2018-04-14 23:49:33 +0000
@@ -1,5 +1,4 @@
 gir1.2-soup-2.4
-protobuf-compiler
 python-configglue
 python-dirspec
 python-distutils-extra
 
=== modified file 'requirements.txt'
--- requirements.txt	2018-03-18 11:59:08 +0000
+++ requirements.txt	2018-04-14 23:49:33 +0000
@@ -1,1 +1,2 @@
 Send2Trash==1.5.0
+magicicadaprotocol==2.0
 
=== modified file 'ubuntuone/platform/tests/linux/test_vm.py'
--- ubuntuone/platform/tests/linux/test_vm.py	2016-07-30 21:58:48 +0000
+++ ubuntuone/platform/tests/linux/test_vm.py	2018-04-14 23:49:33 +0000
@@ -1,8 +1,7 @@
-# tests.platform.linux - linux platform tests
-#
-# Author: Guillermo Gonzalez <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2010-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -33,10 +32,10 @@
 import os
 import uuid
 
+from magicicadaprotocol import request
 from twisted.internet import defer
 
 from contrib.testing.testcase import FakeMain
-from ubuntuone.storageprotocol import request
 from ubuntuone.syncdaemon.tests.test_vm import (
     MetadataTestCase,
     BaseVolumeManagerTests,
 
=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2018-03-14 21:01:56 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2018-04-14 23:49:33 +0000
@@ -42,20 +42,23 @@
 
 import OpenSSL.SSL
 
-from zope.interface import implements
+from magicicadaprotocol import (
+    content_hash,
+    errors as protocol_errors,
+    protocol_pb2,
+)
+from magicicadaprotocol.client import (
+    ThrottlingStorageClient,
+    ThrottlingStorageClientFactory,
+)
+from magicicadaprotocol.context import get_ssl_context
 from twisted.internet import reactor, defer, task
 from twisted.internet import error as twisted_errors
 from twisted.python.failure import Failure, DefaultException
+from zope.interface import implements
 
 from ubuntuone import clientdefs
 from ubuntuone.platform import platform, remove_file
-from ubuntuone.storageprotocol import protocol_pb2, content_hash
-from ubuntuone.storageprotocol import errors as protocol_errors
-from ubuntuone.storageprotocol.client import (
-    ThrottlingStorageClient,
-    ThrottlingStorageClientFactory,
-)
-from ubuntuone.storageprotocol.context import get_ssl_context
 from ubuntuone.syncdaemon.interfaces import IActionQueue, IMarker
 from ubuntuone.syncdaemon.logger import mklog, TRACE
 from ubuntuone.syncdaemon import config, offload_queue
@@ -884,7 +887,7 @@
 
     def buildProtocol(self, addr):
         """Build the client and store it. Connect callbacks."""
-        # XXX: Very Important Note: within the storageprotocol project,
+        # XXX: Very Important Note: within the magicicadaprotocol project,
         # ThrottlingStorageClient.connectionMade sets self.factory.client
         # to self *if* self.factory.client is not None.
         # Since buildProcotol is called before connectionMade, the latter
 
=== modified file 'ubuntuone/syncdaemon/hash_queue.py'
--- ubuntuone/syncdaemon/hash_queue.py	2016-09-17 14:29:53 +0000
+++ ubuntuone/syncdaemon/hash_queue.py	2018-04-14 23:49:33 +0000
@@ -1,10 +1,7 @@
-# ubuntuone.syncdaemon.hash_queue - hash queues
-#
-# Authors: Facundo Batista <[e-mail]>
-#          Guillermo Gonzalez <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -41,11 +38,9 @@
 
 from collections import OrderedDict
 
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.internet import reactor
 
-from ubuntuone.storageprotocol.content_hash import \
-    content_hash_factory, crc32
-
 from ubuntuone.platform import (
     open_file,
     stat_path,
 
=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2018-04-14 23:49:33 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011-2015 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -44,17 +45,14 @@
 
 from functools import wraps
 
+from magicicadaprotocol import request
 from twisted.internet import defer
 
 from ubuntuone.networkstate import NetworkManagerState
-try:
-    from ubuntuone.networkstate.networkstates import ONLINE
-except ImportError:
-    from ubuntuone.networkstate import ONLINE
+from ubuntuone.networkstate.networkstates import ONLINE
 
 from ubuntuone.logger import log_call
 from ubuntuone.platform import ExternalInterface
-from ubuntuone.storageprotocol import request
 from ubuntuone.syncdaemon import config
 from ubuntuone.syncdaemon.action_queue import Download, Upload
 from ubuntuone.syncdaemon.interfaces import IMarker
 
=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2018-03-09 09:11:05 +0000
+++ ubuntuone/syncdaemon/sync.py	2018-04-14 23:49:33 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
-# Copyright 2015-2018 Chicharreros
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -31,15 +31,15 @@
 
 from __future__ import with_statement
 
+import logging
 import os
-import logging
+import sys
 from operator import attrgetter
-import sys
+
+from magicicadaprotocol import delta
 
 from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.storageprotocol import delta
-from ubuntuone.syncdaemon.fsm.fsm import \
-    StateMachineRunner, StateMachine
+from ubuntuone.syncdaemon.fsm.fsm import StateMachineRunner, StateMachine
 from ubuntuone.syncdaemon import u1fsfsm
 from ubuntuone.syncdaemon.logger import DebugCapture
 from ubuntuone.syncdaemon.filesystem_manager import (
 
=== modified file 'ubuntuone/syncdaemon/tests/test_action_queue.py'
--- ubuntuone/syncdaemon/tests/test_action_queue.py	2018-03-14 21:01:56 +0000
+++ ubuntuone/syncdaemon/tests/test_action_queue.py	2018-04-14 23:49:33 +0000
@@ -45,6 +45,13 @@
 
 import OpenSSL.SSL
 
+from magicicadaprotocol import (
+    client,
+    content_hash,
+    errors,
+    protocol_pb2,
+    request,
+)
 from mocker import Mocker, MockerTestCase, ANY, expect
 from twisted.internet import defer, reactor
 from twisted.internet import error as twisted_error
@@ -65,13 +72,6 @@
 from ubuntuone.devtools.testcases import skipTest
 from ubuntuone import logger, clientdefs
 from ubuntuone.platform import open_file, platform, path_exists
-from ubuntuone.storageprotocol import (
-    client,
-    content_hash,
-    errors,
-    protocol_pb2,
-    request,
-)
 from ubuntuone.syncdaemon import interfaces, config
 from ubuntuone.syncdaemon import action_queue
 from ubuntuone.syncdaemon.action_queue import (
 
=== modified file 'ubuntuone/syncdaemon/tests/test_hashqueue.py'
--- ubuntuone/syncdaemon/tests/test_hashqueue.py	2016-09-17 14:29:53 +0000
+++ ubuntuone/syncdaemon/tests/test_hashqueue.py	2018-04-14 23:49:33 +0000
@@ -1,8 +1,7 @@
-#
-# Authors: Facundo Batista <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -32,13 +31,14 @@
 
 from __future__ import with_statement
 
+import logging
 import os
 import random
+import threading
 import time
-import logging
-import threading
-
 from StringIO import StringIO
+
+from magicicadaprotocol.content_hash import content_hash_factory, crc32
 from twisted.trial.unittest import TestCase as TwistedTestCase
 from twisted.internet import defer, reactor
 from ubuntuone.devtools.handlers import MementoHandler
@@ -48,7 +48,6 @@
 from ubuntuone.platform import open_file, stat_path
 from ubuntuone.syncdaemon import hash_queue
 from ubuntuone.syncdaemon.hash_queue import HASHQUEUE_DELAY
-from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
 
 FAKE_TIMESTAMP = 1
 
 
=== modified file 'ubuntuone/syncdaemon/tests/test_interaction_interfaces.py'
--- ubuntuone/syncdaemon/tests/test_interaction_interfaces.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/syncdaemon/tests/test_interaction_interfaces.py	2018-04-14 23:49:33 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011-2015 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -31,15 +32,9 @@
 import logging
 import os
 
+from magicicadaprotocol.protocol_pb2 import AccountInfo
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
-try:
-    from ubuntuone.networkstate.networkstates import ONLINE
-except ImportError:
-    from ubuntuone.networkstate import ONLINE
-from ubuntuone.platform.tests.ipc.test_perspective_broker import (
-    FakeNetworkManagerState,
-)
 
 from contrib.testing.testcase import (
     FAKED_CREDENTIALS,
@@ -50,8 +45,11 @@
     FakeMainTestCase,
     skipIfOS,
 )
+from ubuntuone.networkstate.networkstates import ONLINE
 from ubuntuone.platform import make_dir, make_link
-from ubuntuone.storageprotocol.protocol_pb2 import AccountInfo
+from ubuntuone.platform.tests.ipc.test_perspective_broker import (
+    FakeNetworkManagerState,
+)
 from ubuntuone.syncdaemon import (
     config,
     interaction_interfaces,
 
=== modified file 'ubuntuone/syncdaemon/tests/test_localrescan.py'
--- ubuntuone/syncdaemon/tests/test_localrescan.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/syncdaemon/tests/test_localrescan.py	2018-04-14 23:49:33 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -34,6 +35,7 @@
 import os
 import uuid
 
+from magicicadaprotocol import content_hash as storage_hash, volumes
 from twisted.internet import defer, reactor
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
@@ -62,9 +64,6 @@
 )
 from ubuntuone.syncdaemon.marker import MDMarker
 from ubuntuone.syncdaemon.tritcask import Tritcask
-from ubuntuone.storageprotocol import (
-    content_hash as storage_hash, volumes
-)
 from ubuntuone.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
 
=== modified file 'ubuntuone/syncdaemon/tests/test_sync.py'
--- ubuntuone/syncdaemon/tests/test_sync.py	2018-03-09 09:11:05 +0000
+++ ubuntuone/syncdaemon/tests/test_sync.py	2018-04-14 23:49:33 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
-# Copyright 2015-2018 Chicharreros
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -39,8 +39,11 @@
 import unittest
 import uuid
 
+from magicicadaprotocol import delta
+from magicicadaprotocol.request import ROOT
 from twisted.internet import defer
 from twisted.python.failure import Failure
+from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
 
 from contrib.testing.testcase import (
@@ -49,8 +52,6 @@
     BaseTwistedTestCase,
     Listener,
 )
-
-from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform import (
     make_dir,
     open_file,
@@ -63,8 +64,6 @@
 from ubuntuone.syncdaemon.sync import FSKey, Sync, SyncStateMachineRunner
 from ubuntuone.syncdaemon.volume_manager import Share
 from ubuntuone.syncdaemon.event_queue import EventQueue, EVENTS
-from ubuntuone.storageprotocol.request import ROOT
-from ubuntuone.storageprotocol import delta
 from ubuntuone.syncdaemon.marker import MDMarker
 
 
 
=== modified file 'ubuntuone/syncdaemon/tests/test_vm.py'
--- ubuntuone/syncdaemon/tests/test_vm.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/syncdaemon/tests/test_vm.py	2018-04-14 23:49:33 +0000
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Guillermo Gonzalez <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -40,16 +39,14 @@
 import sys
 import uuid
 
+from magicicadaprotocol import volumes, request
+from magicicadaprotocol.client import ListShares
+from magicicadaprotocol.sharersp import NotifyShareHolder, ShareResponse
+
 from mocker import Mocker, MATCH
 from twisted.internet import defer, reactor
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
-from ubuntuone.storageprotocol import volumes, request
-from ubuntuone.storageprotocol.client import ListShares
-from ubuntuone.storageprotocol.sharersp import (
-    NotifyShareHolder,
-    ShareResponse,
-)
 
 from contrib.testing.testcase import (
     BaseTwistedTestCase,
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2016-06-01 21:38:23 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2018-04-14 23:49:33 +0000
@@ -1,6 +1,7 @@
-# ubuntuone.syncdaemon.volume_manager - manages volumes
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -41,14 +42,14 @@
 
 from itertools import ifilter
 
-from twisted.internet import defer
-from ubuntuone.platform import expand_user
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.volumes import (
+from magicicadaprotocol import request
+from magicicadaprotocol.volumes import (
     ShareVolume,
     UDFVolume,
     RootVolume,
 )
+from twisted.internet import defer
+from ubuntuone.platform import expand_user
 
 from ubuntuone.syncdaemon.marker import MDMarker
 from ubuntuone.syncdaemon.interfaces import IMarker