Merge pull request #6 from lystable/feature/remove-pdb

Remove pdb
kalohq · Oct 15, 2015 · 216bdf2 · 216bdf2
2 parents 584a007 + 125f330
commit 216bdf2
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/dennis/tasks/release.py b/dennis/tasks/release.py
@@ -33,9 +33,6 @@ def run(self):
 
         release_pr = self.github_repo.get_pull(pr_id)
 
-        import pdb
-        pdb.set_trace()
-
         # Merge PR into master
         if release_pr.mergeable and not release_pr.is_merged():
             _log.info('Pull request "{}" in {} is mergeable, merging'.format(
@@ -67,16 +64,6 @@ def run(self):
         )
 
         # Merge master into develop
-        mergeback_pr = self.github_repo.create_pull(
-            'Master back into Develop', '',
-            'develop', 'master'
-        )
-        if mergeback_pr.mergeable:
-            _log.info('Pull request "{}" in {} is mergeable, merging'.format(
-                mergeback_pr.title,
-                self.repo_name
-            ))
-            self._merge(mergeback_pr)
 
     def _get_release_changelog(
         self, last_tag, new_tag, repo, owner