Merge lp:~robru/cupstream2distro/ditch-dotproject into lp:cupstream2distro

[Robert Bruce Park]

Rip out DotProject

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1183
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/846/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/846/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Looks good in staging, really happy with this one.

review: Approve

=== modified file 'citrain/recipes/base.py'
--- citrain/recipes/base.py	2015-10-24 09:24:59 +0000
+++ citrain/recipes/base.py	2015-10-25 00:27:54 +0000
@@ -36,7 +36,6 @@
 from cupstream2distro.packagelist import PackageList
 from cupstream2distro.archive import Archive, ArchWatcher, newest
 from cupstream2distro.branchhandling import Branch
-from cupstream2distro.project import DotProject
 from cupstream2distro.version import V
 from cupstream2distro.errors import (
     BuildError,
@@ -52,10 +51,12 @@
 )
 from cupstream2distro.utils import (
     SILO_DIR,
+    atomic_write,
     env,
     log_value_of,
     name_ppa,
     suppress,
+    utf8_open,
 )
 
 
@@ -115,15 +116,11 @@
 def clean_source(source):
     """Clean all related source content from current silos."""
     logging.info('Cleaning silo files associated with {}.'.format(source))
-    config_file = DotProject(source).filename
     source_dir = SILO_DIR(source)
     with suppress(OSError):
-        log_value_of.config_file('Deleting!')
-        os.remove(config_file)
-    with suppress(OSError):
         log_value_of.source_dir('Deleting!')
         shutil.rmtree(source_dir)
-    fileglob = '{}_*'.format(source)
+    fileglob = '{}[._]*'.format(source)
     for path in glob(SILO_DIR(fileglob)):
         log_value_of.path('Deleting!')
         with suppress(OSError):
@@ -135,6 +132,7 @@
 class BuildBase(Package, Branch, Archive):
     """Outlines build steps common to all types of package builds."""
     blame = lp.people[env.BUILD_USER_ID] if env.BUILD_USER_ID else None
+    magic = ('dest_current_version', 'published_version')
     packagelist = None
     authorized = None
     failures = set()
@@ -156,6 +154,45 @@
         self.target = None
         self.dest = dest
 
+    def find_file(self, key):
+        """Identify where keyfiles are located."""
+        return '{}_{}'.format(self.path, key)
+
+    def set_file(self, key, value):
+        """Atomically write a value to a file."""
+        with atomic_write(self.find_file(key), 'w') as data:
+            data.write(str(value))
+
+    def get_file(self, key):
+        try:
+            with utf8_open(self.find_file(key)) as data:
+                return data.read().strip()
+        except FileNotFoundError:
+            # TODO: This is transitional, drop after last .project file goes.
+            with suppress(FileNotFoundError):
+                with utf8_open(self.path + '.project') as data:
+                    for line in data:
+                        if line.startswith(key):
+                            logging.debug('Fell back to .project file.')
+                            value = line.strip().split()[-1]
+                            value = {'=': ''}.get(value, value)
+                            setattr(self, key, value)
+                            return value
+
+    def __getattr__(self, attr):
+        """Fetch some special properties."""
+        if attr in self.magic:
+            return self.get_file(attr)
+        raise AttributeError
+
+    def __setattr__(self, attr, value):
+        """Set some special properties."""
+        super().__setattr__(attr, value)
+        if attr in self.magic:
+            log_value_of.attr('Setting')
+            log_value_of.value('To')
+            self.set_file(attr, value)
+
     def validate_phase(self):
         """Stub validate phase."""
         pass
@@ -388,7 +425,7 @@
                 logging.info(
                     'Checking for new {} uploads at dest.'.format(self.name))
                 version = self.get_archive_version(self.dest, self.series)
-                supposed = DotProject(self.name).dest_current_version
+                supposed = self.dest_current_version
                 log_value_of.version('Dest archive has')
                 log_value_of.supposed('At build time, dest had')
                 if supposed and version != supposed:
@@ -408,18 +445,14 @@
             dest_version = self.get_archive_version(self.dest, self.series)
             if V(version) > dest_version:
                 self.packagelist.publish_source(source, dest_version)
-                self.mark_published(version)
+                self.published_version = version
             else:
                 logging.warning(
                     '{} version {} not greater than {}, skipping.'.format(
                         self.name, version, dest_version))
         else:
             self.copy_to_archive(source)
-            self.mark_published(version)
-
-    def mark_published(self, version):
-        """Record what version was published."""
-        DotProject(self.name).mark_as_published(version)
+            self.published_version = version
 
     @classmethod
     def post_publish_phase(cls, silo_state):
@@ -429,7 +462,7 @@
 
     def migration_phase(self):
         """Identify the location of this package in its migration."""
-        version = DotProject(self.name).published_version
+        version = self.published_version
         log_value_of.version('Checking for')
         self.states[self.name] = self.check_archive_migration(version)
         logging.info('{}: {}'.format(self.name, self.states[self.name]))

=== modified file 'citrain/recipes/manual.py'
--- citrain/recipes/manual.py	2015-09-14 19:55:26 +0000
+++ citrain/recipes/manual.py	2015-10-25 00:27:54 +0000
@@ -26,7 +26,6 @@
 sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 
 from citrain.recipes.base import BuildBase, clean_source
-from cupstream2distro.project import DotProject
 from cupstream2distro.utils import SILO_DIR
 
 
@@ -52,10 +51,9 @@
     def diff_phase(self):
         """Download manually uploaded sources from PPA."""
         clean_source(self.name)
-        our_version = self.get_archive_version(self.silo_ppa)
         dest_version = self.get_archive_version(self.dest)
         self.get_from_archive(SILO_DIR(), self.silo_ppa)
-        DotProject.soft_save(self.name, dest=dest_version, ours=our_version)
+        self.dest_current_version = dest_version
 
         # Proceed with standard diffing.
         super().diff_phase()

=== modified file 'citrain/recipes/merge.py'
--- citrain/recipes/merge.py	2015-10-23 07:28:58 +0000
+++ citrain/recipes/merge.py	2015-10-25 00:27:54 +0000
@@ -25,7 +25,6 @@
 sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 
 from citrain.recipes.base import BuildBase
-from cupstream2distro.project import DotProject
 from cupstream2distro.revno import Rev
 from cupstream2distro.version import V
 from cupstream2distro.errors import BuildError, PrepError
@@ -139,7 +138,7 @@
         Rev(self.name, target.web_link).write(target.last_scanned_id)
         self.get_branch(target.web_link)
         trunk_version = self.get_package_version()
-        DotProject.soft_save(self.name, dest=trunk_version)
+        self.dest_current_version = trunk_version
         for merge in merges:
             branch = merge.source_branch.web_link
             message = self.generate_commit_message(merge)
@@ -169,7 +168,6 @@
         authors = self.collect_changelog_contents()
         self.update_package_changelog(new_version, authors)
         self.release_branch(new_version)
-        DotProject.soft_save(self.name, ours=new_version)
 
     def generate_commit_message(self, merge):
         """Generate a commit message to use when committing merges.

=== modified file 'citrain/recipes/secondary.py'
--- citrain/recipes/secondary.py	2015-10-24 00:05:41 +0000
+++ citrain/recipes/secondary.py	2015-10-25 00:27:54 +0000
@@ -91,10 +91,6 @@
         """The primary dest_version_check phase already tracks versions."""
         pass
 
-    def mark_published(self, version):
-        """The primary mark_published function handles this."""
-        pass
-
     def migration_phase(self):
         """The primary migration phase takes care of migration reporting."""
         pass

=== modified file 'citrain/recipes/sourcesync.py'
--- citrain/recipes/sourcesync.py	2015-08-22 04:23:10 +0000
+++ citrain/recipes/sourcesync.py	2015-10-25 00:27:54 +0000
@@ -30,7 +30,6 @@
 from glob import glob
 
 from citrain.recipes.base import BuildBase
-from cupstream2distro.project import DotProject
 from cupstream2distro.version import V
 from cupstream2distro.errors import BuildError
 from cupstream2distro.utils import SILO_DIR, log_value_of, suppress
@@ -87,4 +86,4 @@
         self.rename_orig_tarball(new_upstream)
         self.correct_package_changelog(new_version, self.series.name)
         self.initialize_branch()
-        DotProject.soft_save(self.name, dest=dest_version, ours=new_version)
+        self.dest_current_version = dest_version

=== modified file 'citrain/revert.py'
--- citrain/revert.py	2015-09-24 05:06:40 +0000
+++ citrain/revert.py	2015-10-25 00:27:54 +0000
@@ -48,7 +48,6 @@
 from citrain.recipes.manager import Manager
 from citrain.recipes.sourcesync import SourceSync
 from cupstream2distro.version import V
-from cupstream2distro.project import DotProject
 from cupstream2distro.archive import sort_by_date
 from citrain.build import main as build_main
 from cupstream2distro.errors import RevertError
@@ -99,7 +98,7 @@
         call(['dch', '-r', '-D', self.series.name, '--force-distribution', ''],
              cwd=self.path)
         self.initialize_branch()
-        DotProject.soft_save(self.name, dest=current, ours=new_version)
+        self.dest_current_version = current
 
 
 class RevertManager(Manager):

=== removed file 'cupstream2distro/project.py'
--- cupstream2distro/project.py	2015-10-02 20:13:54 +0000
+++ cupstream2distro/project.py	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014 Canonical
-#
-# 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 the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-"""Class for .project files, which store per-package version numbers."""
-
-import os
-
-from glob import glob
-from os.path import join
-from six.moves import configparser
-
-from cupstream2distro.utils import (
-    SILO_DIR,
-    log_value_of,
-    suppress,
-    utf8_open,
-)
-
-SECTION = 'Package'
-
-
-def _get_project_files(infix):
-    """Glob for the project files."""
-    return glob(join(SILO_DIR(), '*{}'.format(infix)))
-
-
-def _get_state(filename):
-    """Read the .project file from disk unconditionally and return it."""
-    config = configparser.RawConfigParser()
-    with suppress(IOError):
-        with utf8_open(filename) as data:
-            config.readfp(data)
-    return config
-
-
-class DotProject(object):
-    """Provide a standard API for accessing and modifying .project files."""
-    SUFFIX = '.project'
-    _state = None
-
-    @staticmethod
-    def get_all_packages_uploaded():
-        """Get (package, version) of all packages uploaded.
-
-        We do not rely on the .changes files because we need the exact version,
-        which can have an epoch. And also because the .changes files are not
-        present for manual source uploads.
-        """
-        result = set()
-        project_files = _get_project_files(DotProject.SUFFIX)
-        log_value_of.project_files()
-        for filename in project_files:
-            basename = os.path.basename(filename)
-            name = basename.split(DotProject.SUFFIX)[0]
-            proj = DotProject(name)
-            result.add((name, proj.packaging_version))
-        log_value_of.result('Returning')
-        return result
-
-    @staticmethod
-    def soft_save(name, dest='', ours=''):
-        """Create a .project file without overwriting values in an old one."""
-        proj = DotProject(name)
-        proj.dest_current_version = dest or proj.dest_current_version
-        proj.packaging_version = ours or proj.packaging_version
-        proj.write()
-
-    def __init__(self, source_package_name):
-        """Identify the location of the .project file."""
-        super().__setattr__('name', source_package_name)
-        super().__setattr__('filename', SILO_DIR(self.name + self.SUFFIX))
-
-    @property
-    def state(self):
-        """Load the .project file from disk if necessary."""
-        if not self._state:
-            super().__setattr__('_state', _get_state(self.filename))
-        return self._state
-
-    def __getattr__(self, key):
-        """Access a value from a .project file, reading from disk if needed."""
-        with suppress(configparser.NoSectionError, configparser.NoOptionError):
-            return self.state.get(SECTION, key)
-        return ''
-
-    def __setattr__(self, key, value):
-        """Set a value for the .project file in memory only."""
-        with suppress(configparser.Error):
-            self.state.add_section(SECTION)
-        log_value_of.key('Setting')
-        log_value_of.value('To')
-        self.state.set(SECTION, key, value)
-
-    def mark_as_published(self, version):
-        """Record the published version in the project file."""
-        self.published_version = version
-        self.write()
-
-    def write(self):
-        """Write the .project file to disk if we have something to write."""
-        with utf8_open(self.filename, 'w') as data:
-            if self._state:
-                self._state.write(data)

=== removed directory 'tests/data/project_files'
=== removed file 'tests/data/project_files/foo.project'
--- tests/data/project_files/foo.project	2015-03-02 03:40:36 +0000
+++ tests/data/project_files/foo.project	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[Package]
-dest_current_version = 6.12.0-0ubuntu1
-packaging_version = 6.12.0daily13.02.27-0ubuntu1

=== removed file 'tests/unit/test_project.py'
--- tests/unit/test_project.py	2015-10-24 09:52:33 +0000
+++ tests/unit/test_project.py	1970-01-01 00:00:00 +0000
@@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright: (C) 2014 Canonical
-#
-# 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 the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-"""Tests for DotProject class."""
-
-from tests.unit import DirectoryAwareTestCase
-
-from os.path import join
-from cupstream2distro import project
-from cupstream2distro.project import DotProject
-from cupstream2distro.utils import env, utf8_open
-
-import os
-import shutil
-
-
-class ProjectTests(DirectoryAwareTestCase):
-    """Test cupstream2distro DotProject class."""
-    def setUp(self):
-        """Mock out SILO_DIR and SILOS_DIR for testing."""
-        super().setUp()
-        project.SILO_DIR = lambda *parts: join(self.tempdir, *parts)
-        env.SILONAME = ''
-
-    def test_file_creation(self):
-        """Do we create an empty file when saving an empty project?"""
-        proj = DotProject('hello')
-        proj.write()
-        self.assertTrue(os.path.isfile(
-            join(self.tempdir, 'hello.project')))
-        path = join(self.tempdir, 'hello.project')
-        with utf8_open(path) as data:
-            self.assertEqual(data.readlines(), [])
-
-    def test_file_writing(self):
-        """Does the written file have the expected values in it?"""
-        proj = DotProject('yeehaw')
-        proj.dest_current_version = '0.99.alpha+15.04.20141225-0ubuntu1'
-        proj.packaging_version = '1.0+15.04.20150101-0ubuntu1'
-        proj.write()
-        path = join(self.tempdir, 'yeehaw.project')
-        with utf8_open(path) as data:
-            self.assertEqual(data.readlines(), [
-                '[Package]\n',
-                'dest_current_version = 0.99.alpha+15.04.20141225-0ubuntu1\n',
-                'packaging_version = 1.0+15.04.20150101-0ubuntu1\n',
-                '\n',
-            ])
-
-    def test_soft_save_initial(self):
-        """Does the soft_save method create the expected values in the file?"""
-        DotProject.soft_save(
-            'yessir', dest='0.1', ours='0.2')
-        path = join(self.tempdir, 'yessir.project')
-        with utf8_open(path) as data:
-            self.assertEqual(data.readlines(), [
-                '[Package]\n',
-                'dest_current_version = 0.1\n',
-                'packaging_version = 0.2\n',
-                '\n',
-            ])
-
-    def test_soft_save_initial_with_blanks(self):
-        """Does soft_save create the expected blank values in the file?"""
-        DotProject.soft_save('yessir', dest='', ours='0.2')
-        path = join(self.tempdir, 'yessir.project')
-        with utf8_open(path) as data:
-            self.assertEqual(data.readlines(), [
-                '[Package]\n',
-                'dest_current_version = \n',
-                'packaging_version = 0.2\n',
-                '\n',
-            ])
-
-    def test_soft_save_twice(self):
-        """Does a second call to soft_save preserve original values?"""
-        DotProject.soft_save('yessir', dest='0.1', ours='0.2')
-        DotProject.soft_save('yessir', ours='0.3')
-        path = join(self.tempdir, 'yessir.project')
-        with utf8_open(path) as data:
-            self.assertEqual(data.readlines(), [
-                '[Package]\n',
-                'dest_current_version = 0.1\n',
-                'packaging_version = 0.3\n',
-                '\n',
-            ])
-
-    def test_file_reading(self):
-        """If we create a file manually, can DotProject read those values?"""
-        path = join(self.tempdir, 'fuddy.project')
-        with utf8_open(path, 'w') as data:
-            data.write(
-                '[Package]\n'
-                'dest_current_version = 0.99\n'
-                'packaging_version = 1.0\n'
-                'branch = lp:𝖚𝖓𝖎𝖈𝖔𝖉𝖊-𝖕𝖗𝖔𝖏𝖊𝖈𝖙\n\n')
-        proj = DotProject('fuddy')
-        self.assertEqual(proj.branch, 'lp:𝖚𝖓𝖎𝖈𝖔𝖉𝖊-𝖕𝖗𝖔𝖏𝖊𝖈𝖙')
-        self.assertEqual(proj.dest_current_version, '0.99')
-        self.assertEqual(proj.packaging_version, '1.0')
-
-    def test_get_previous_distro_version_from_config(self):
-        """Can we access dest_current_version?"""
-        shutil.copy2(
-            join(self.project_file_dir, 'foo.project'),
-            self.tempdir)
-        self.assertEqual(
-            DotProject('foo').dest_current_version,
-            '6.12.0-0ubuntu1')
-
-    def test_get_all_packages_uploaded(self):
-        """Does get_all_packages_uploaded find one file?"""
-        shutil.copy2(
-            join(self.project_file_dir, 'foo.project'),
-            self.tempdir)
-        self.assertEqual(
-            DotProject.get_all_packages_uploaded(),
-            set([('foo', '6.12.0daily13.02.27-0ubuntu1')]))
-
-    def test_get_all_packages_uploaded_multi(self):
-        """Does get_all_packages_uploaded find three files?"""
-        shutil.copy2(
-            join(self.project_file_dir, 'foo.project'),
-            self.tempdir)
-        path = join(self.tempdir, 'f.project')
-        with utf8_open(path, 'w') as data:
-            data.write(
-                '[Package]\n'
-                'dest_current_version = 0.99\n'
-                'packaging_version = 1.0\n\n'
-                'published_version = 2.0\n'
-                'wut = yo\n\n')
-        proj = DotProject('bar')
-        proj.packaging_version = 'OVER NINE THOUSAND'
-        proj.write()
-        self.assertEqual(
-            DotProject.get_all_packages_uploaded(), set([
-                ('f', '1.0'),
-                ('foo', '6.12.0daily13.02.27-0ubuntu1'),
-                ('bar', 'OVER NINE THOUSAND'),
-            ]))
-
-    def test_mark_project_as_published(self):
-        """Confirm project file creation to avoid re-publishing projects."""
-        shutil.copy2(join(self.project_file_dir, 'foo.project'),
-                     self.tempdir)
-        DotProject('foo').mark_as_published('4.2dailysomething-0ubuntu1')
-        filename = join(self.tempdir, 'foo.project')
-        self.assertTrue(os.path.isfile(filename))
-        with utf8_open(filename) as data:
-            self.assertEqual(data.readlines(), [
-                '[Package]\n',
-                'dest_current_version = 6.12.0-0ubuntu1\n',
-                'packaging_version = 6.12.0daily13.02.27-0ubuntu1\n',
-                'published_version = 4.2dailysomething-0ubuntu1\n',
-                '\n',
-            ])
-
-    def test_mark_project_and_diff_as_published(self):
-        """Confirm diff file creation to prevent project republishing."""
-        shutil.copy2(join(self.project_file_dir, 'foo.project'),
-                     self.tempdir)
-        shutil.copy2(join(self.project_file_dir, 'foo.project'),
-                     join(
-                         self.tempdir, 'packaging_changes_foo_4.2'
-                         'dailysomething-0ubuntu1.diff'))
-        DotProject('foo').mark_as_published('4.2dailysomething-0ubuntu1')

=== modified file 'tests/unit/test_recipe_base.py'
--- tests/unit/test_recipe_base.py	2015-10-24 09:36:34 +0000
+++ tests/unit/test_recipe_base.py	2015-10-25 00:27:54 +0000
@@ -16,7 +16,7 @@
 
 """Tests for CI Train Build script."""
 
-from os.path import join
+from os.path import isfile, join
 from pprint import pprint
 from mock import Mock, call, patch
 
@@ -28,7 +28,7 @@
     DEPWAIT_TIMEOUT as DW,
     PPA_TIMEOUT as PT,
 )
-from cupstream2distro.utils import env
+from cupstream2distro.utils import env, utf8_open
 from cupstream2distro.errors import (
     CITrainError,
     PublishError,
@@ -78,6 +78,40 @@
         BuildBase.failures.clear()
         BuildBase.packagelist = None
 
+    def test_getattr(self):
+        """Ensure we can read files from disk."""
+        path = join(self.tempdir, 'getattr_published_version')
+        with utf8_open(path, 'w') as data:
+            data.write('hello')
+        build = BuildBase('getattr', self.dest, self.series, self.ppa)
+        self.assertEqual(build.published_version, 'hello')
+
+    def test_getattr_failed(self):
+        """Raise AttributeError for wrong attributes."""
+        build = BuildBase('wrong', self.dest, self.series, self.ppa)
+        with self.assertRaises(AttributeError):
+            build.zipblorp()
+
+    def test_getattr_transition(self):
+        """Ensure we can still read from .project files."""
+        path = join(self.tempdir, 'transition.project')
+        new_path = join(self.tempdir, 'transition_published_version')
+        self.assertFalse(isfile(new_path))
+        with utf8_open(path, 'w') as data:
+            data.write('watever\nglorp\npublished_version = hiya\n')
+        build = BuildBase('transition', self.dest, self.series, self.ppa)
+        self.assertEqual(build.published_version, 'hiya')
+        with utf8_open(new_path) as data:
+            self.assertEqual(data.read().strip(), 'hiya')
+
+    def test_getattr_transition_empty(self):
+        """Ensure we can still read from .project files."""
+        path = join(self.tempdir, 'transition.project')
+        with utf8_open(path, 'w') as data:
+            data.write('published_version =\nha\n')
+        build = BuildBase('transition', self.dest, self.series, self.ppa)
+        self.assertEqual(build.published_version, '')
+
     def test_pre_validate(self):
         """Test some nops."""
         mock = Mock()
@@ -137,17 +171,14 @@
     @patch('citrain.recipes.base.os')
     @patch('citrain.recipes.base.glob')
     @patch('citrain.recipes.base.shutil')
-    @patch('citrain.recipes.base.DotProject')
-    def test_buildbase_clean_phase(self, dp_mock, sh_mock, glob_mock, os_mock):
+    def test_buildbase_clean_phase(self, sh_mock, glob_mock, os_mock):
         """Clean phase cleans sources."""
         glob_mock.return_value = ['/silo/dir/foo_hi']
         build = BuildBase('foo', Mock(), Mock(), Mock())
         func = 'citrain.recipes.base.SILO_DIR'
         with patch(func, lambda *parts: join(self.tempdir, *parts)):
             build.clean_phase()
-        dp_mock.assert_called_once_with('foo')
         self.assertEqual(os_mock.remove.mock_calls, [
-            call(dp_mock.return_value.filename),
             call('/silo/dir/foo_hi'),
         ])
         self.assertEqual(sh_mock.rmtree.mock_calls, [
@@ -579,14 +610,13 @@
             build.ackaging_phase()
 
     @patch('citrain.recipes.base.lp')
-    @patch('citrain.recipes.base.DotProject')
     @patch('citrain.recipes.base.BuildBase.get_archive_version', Mock())
-    def test_buildbase_dest_version_check_phase(self, dp_mock, lp_mock):
+    def test_buildbase_dest_version_check_phase(self, lp_mock):
         """Ensure dest versions are correctly checked."""
         lp_mock.is_distro_archive.return_value = True
         env.IGNORE_VERSIONDESTINATION = 'false'
-        dp_mock.return_value.dest_current_version = '1.0'
         build = BuildBase('grue', self.series, self.dest, self.ppa)
+        build.dest_current_version = '1.0'
         build.get_archive_version.return_value = '1.1'
         build.dest_version_check_phase()
         self.assertEqual(build.failures, {
@@ -595,17 +625,16 @@
         })
 
     @patch('citrain.recipes.base.lp')
-    @patch('citrain.recipes.base.DotProject')
     @patch('citrain.recipes.base.BuildBase.get_archive_version', Mock())
-    def test_buildbase_dest_version_check_phase_pass(self, dp_mock, lp_mock):
+    def test_buildbase_dest_version_check_phase_pass(self, lp_mock):
         """Ensure dest versions are correctly checked."""
         lp_mock.is_distro_archive.return_value = True
         env.IGNORE_VERSIONDESTINATION = 'false'
-        dp_mock.return_value.dest_current_version = '1.0'
         build = BuildBase('grue', self.series, self.dest, self.ppa)
+        build.dest_current_version = '1.0'
         build.get_archive_version.return_value = '1.0'
         build.dest_version_check_phase()
-        dp_mock.return_value.dest_current_version = '1.1'
+        build.dest_current_version = '1.1'
         lp_mock.is_distro_archive.return_value = False
         build.dest_version_check_phase()
         lp_mock.is_distro_archive.return_value = True
@@ -623,10 +652,9 @@
         self.assertEqual(BuildBase.packagelist, pl_mock.return_value)
 
     @patch('citrain.recipes.base.lp')
-    @patch('citrain.recipes.base.DotProject')
     @patch('citrain.recipes.base.BuildBase.get_archive_version', Mock())
     @patch('citrain.recipes.base.BuildBase.get_source_from_archive', Mock())
-    def test_buildbase_publish_phase_distro(self, dp_mock, lp_mock):
+    def test_buildbase_publish_phase_distro(self, lp_mock):
         """Do some publishing!"""
         lp_mock.is_distro_archive.return_value = True
         build = BuildBase('florp', self.series, self.dest, self.ppa)
@@ -637,18 +665,15 @@
         build.publish_phase()
         build.packagelist.publish_source.assert_called_once_with(
             source, 'Schwifty-one')
-        dp_mock.assert_called_once_with('florp')
-        dp_mock.return_value.mark_as_published.assert_called_once_with(
-            'Schwifty-two')
         build.get_source_from_archive.assert_called_once_with()
         build.get_archive_version.assert_called_once_with(
             build.dest, build.series)
+        self.assertEqual(build.published_version, 'Schwifty-two')
 
     @patch('citrain.recipes.base.lp')
-    @patch('citrain.recipes.base.DotProject')
     @patch('citrain.recipes.base.BuildBase.get_archive_version', Mock())
     @patch('citrain.recipes.base.BuildBase.get_source_from_archive', Mock())
-    def test_buildbase_publish_phase_skipped(self, dp_mock, lp_mock):
+    def test_buildbase_publish_phase_skipped(self, lp_mock):
         """Skip packages that aren't newer than distro."""
         lp_mock.is_distro_archive.return_value = True
         build = BuildBase('glorp', self.series, self.dest, self.ppa)
@@ -658,17 +683,15 @@
         build.packagelist = Mock()
         build.publish_phase()
         self.assertEqual(build.packagelist.publish_source.mock_calls, [])
-        self.assertEqual(dp_mock.mock_calls, [])
         build.get_source_from_archive.assert_called_once_with()
         build.get_archive_version.assert_called_once_with(
             build.dest, build.series)
 
     @patch('citrain.recipes.base.lp')
-    @patch('citrain.recipes.base.DotProject')
     @patch('citrain.recipes.base.BuildBase.copy_to_archive', Mock())
     @patch('citrain.recipes.base.BuildBase.get_archive_version', Mock())
     @patch('citrain.recipes.base.BuildBase.get_source_from_archive', Mock())
-    def test_buildbase_publish_phase_ppa(self, dp_mock, lp_mock):
+    def test_buildbase_publish_phase_ppa(self, lp_mock):
         """Call copyPackage directly for PPA destinations."""
         lp_mock.is_distro_archive.return_value = False
         build = BuildBase('norp', self.series, self.dest, self.ppa)
@@ -680,9 +703,7 @@
         build.get_source_from_archive.assert_called_once_with()
         self.assertEqual(build.get_archive_version.mock_calls, [])
         build.copy_to_archive.assert_called_once_with(source)
-        dp_mock.assert_called_once_with('norp')
-        dp_mock.return_value.mark_as_published.assert_called_once_with(
-            'Schwifty-two')
+        self.assertEqual(build.published_version, 'Schwifty-two')
 
     def test_buildbase_post_publish_phase(self):
         """Write PackageList to disk."""
@@ -694,14 +715,12 @@
         self.assertEqual(silo_state.mock_calls, [])
         BuildBase.packagelist.write.assert_called_once_with()  # ONCE
 
-    @patch('citrain.recipes.base.DotProject')
-    def test_buildbase_migration_phase(self, dp_mock):
+    def test_buildbase_migration_phase(self):
         """Report the location status of this package."""
-        dp_mock.return_value.published_version = '2.0'
         build = BuildBase('foo', self.series, self.dest, self.ppa)
+        build.published_version = '2.0'
         build.check_archive_migration = Mock(return_value='Release pocket')
         build.migration_phase()
-        dp_mock.assert_called_once_with('foo')
         build.check_archive_migration.assert_called_once_with('2.0')
         self.assertEqual(
             BuildBase.states,

=== modified file 'tests/unit/test_recipe_manual.py'
--- tests/unit/test_recipe_manual.py	2015-09-22 06:53:49 +0000
+++ tests/unit/test_recipe_manual.py	2015-10-25 00:27:54 +0000
@@ -66,7 +66,7 @@
             manual.diff_phase()
         cs_mock.assert_called_once_with('zappy')
         self.assertEqual(manual.get_archive_version.mock_calls, [
-            call(self.ppa), call(self.dest),
+            call(self.dest),
         ])
         manual.get_from_archive.assert_called_once_with(
             self.tempdir, manual.silo_ppa)

=== modified file 'tests/unit/test_recipe_secondary.py'
--- tests/unit/test_recipe_secondary.py	2015-10-24 00:05:41 +0000
+++ tests/unit/test_recipe_secondary.py	2015-10-25 00:27:54 +0000
@@ -60,7 +60,6 @@
         sec.ackaging_phase()
         sec.migration_phase()
         sec.enumeration_phase()
-        sec.mark_published('boo')
         self.assertEqual(sec.upload_package.mock_calls, [])
         self.assertEqual(sec.get_from_archive.mock_calls, [])
         self.assertEqual(sec.generate_package_diffs.mock_calls, [])

=== modified file 'tests/unit/test_recipe_sourcesync.py'
--- tests/unit/test_recipe_sourcesync.py	2015-09-22 06:53:49 +0000
+++ tests/unit/test_recipe_sourcesync.py	2015-10-25 00:27:54 +0000
@@ -40,14 +40,13 @@
     @patch(MOD + 'os')
     @patch(MOD + 'glob')
     @patch(MOD + 'shutil')
-    @patch(MOD + 'DotProject')
     @patch(MOD + 'SourceSync.from_archive', Mock())
     @patch(MOD + 'SourceSync.get_from_archive', Mock())
     @patch(MOD + 'SourceSync.initialize_branch', Mock())
     @patch(MOD + 'SourceSync.get_archive_version', Mock())
     @patch(MOD + 'SourceSync.get_package_version', Mock())
     @patch(MOD + 'SourceSync.correct_package_changelog', Mock())
-    def test_collect(self, dp_mock, sh_mock, glob_mock, os_mock):
+    def test_collect(self, sh_mock, glob_mock, os_mock):
         """Syncs can download from sync sources."""
         self.dest.distribution.name = 'ubuntu-rtm'
         self.dest.name = 'primary'
@@ -89,22 +88,19 @@
         sync.correct_package_changelog.assert_called_once_with(
             '1+15.04.20150208~rtm-0ubuntu2', self.series.name)
         sync.initialize_branch.assert_called_once_with()
-        dp_mock.soft_save.assert_called_once_with(
-            'sink',
-            dest=sync.get_archive_version.return_value,
-            ours='1+15.04.20150208~rtm-0ubuntu2')
+        self.assertEqual(
+            sync.dest_current_version, '1+15.04.20150208~rtm-0ubuntu1')
 
     @patch(MOD + 'os')
     @patch(MOD + 'glob')
     @patch(MOD + 'shutil')
-    @patch(MOD + 'DotProject')
     @patch(MOD + 'SourceSync.from_archive', Mock())
     @patch(MOD + 'SourceSync.get_from_archive', Mock())
     @patch(MOD + 'SourceSync.initialize_branch', Mock())
     @patch(MOD + 'SourceSync.get_archive_version', Mock())
     @patch(MOD + 'SourceSync.get_package_version', Mock())
     @patch(MOD + 'SourceSync.correct_package_changelog', Mock())
-    def test_collect_nrtm(self, dp_mock, sh_mock, glob_mock, os_mock):
+    def test_collect_nrtm(self, sh_mock, glob_mock, os_mock):
         """Source syncs from the same distro modify version numbers, non RTM"""
         self.dest.distribution.name = 'ubuntu'
         self.dest.name = 'primary'
@@ -132,10 +128,8 @@
         ])
         sync.correct_package_changelog.assert_called_once_with(
             '1+15.04.20150210-0ubuntu1', self.series.name)
-        dp_mock.soft_save.assert_called_once_with(
-            'sink',
-            dest=sync.get_archive_version.return_value,
-            ours='1+15.04.20150210-0ubuntu1')
+        self.assertEqual(
+            sync.dest_current_version, '1+15.04.20150208-0ubuntu1')
 
     @patch(MOD + 'glob')
     @patch(MOD + 'SourceSync.from_archive', Mock())

=== modified file 'tests/unit/test_script_revert.py'
--- tests/unit/test_script_revert.py	2015-10-22 22:41:56 +0000
+++ tests/unit/test_script_revert.py	2015-10-25 00:27:54 +0000
@@ -33,11 +33,8 @@
 
     def setUp(self):
         super().setUp()
-        self.revert = self.script.Revert(Mock(), Mock(), Mock(), Mock())
-        self.revert.name = 'regress'
+        self.revert = self.script.Revert('regress', Mock(), Mock(), Mock())
         self.revert.series = Mock(version='15.04')
-        self.revert.dest = Mock()
-        self.revert.silo_ppa = Mock()
 
     def test_revert_collect_phase(self):
         """Ensure that Revert class can get packages to revert to."""
@@ -70,8 +67,7 @@
                  cwd=revert.path),
         ])
         revert.initialize_branch.assert_called_once_with()
-        self.script.DotProject.soft_save.assert_called_once_with(
-            'regress', dest='2.0', ours=new_version + '-0ubuntu1')
+        self.assertEqual(revert.dest_current_version, '2.0')
 
     def test_revert_collect_phase_epoch(self):
         """Ensure that Revert class can handle epoch'd versions."""
@@ -104,8 +100,7 @@
                  cwd=revert.path),
         ])
         revert.initialize_branch.assert_called_once_with()
-        self.script.DotProject.soft_save.assert_called_once_with(
-            'regress', dest='2:2.0', ours='2:{}-0ubuntu1'.format(new_version))
+        self.assertEqual(revert.dest_current_version, '2:2.0')
 
     def test_revert_collect_phase_none_found(self):
         """Raise the correct error when there's no previous version."""