Fix call to 'bdist_egg' in the release command

fchauvel · Aug 25, 2015 · 715da80 · 715da80
1 parent 9d4c730
commit 715da80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/flap/util.py b/flap/util.py
@@ -101,8 +101,6 @@ def commit(self, message):
     def tag(self, version):
         command = ["git.exe", "tag", "-a", "v" + str(version), "-m", "\"Version %s\"" % str(version) ]
         subprocess.call(command, env=self.environment, shell=True)
-        command = ["git.exe", "push", "--tag"]
-        subprocess.call(command, env=self.environment, shell=True)
 
 
 class Release(Command):
@@ -149,7 +147,7 @@ def releasedVersion(self, currentVersion):
         return releasedVersion
 
     def build(self):
-        self.runCommand(bdist_egg)
+        self.run_command("bdist_egg")
 
     def prepareNextRelease(self, releasedVersion):
         newVersion = releasedVersion.nextMicroRelease()

diff --git a/tests/unit/util.py b/tests/unit/util.py
@@ -82,8 +82,7 @@ def testTag(self):
         with patch("subprocess.call", mock):
             scm = SourceControl()
             scm.tag(Version(2, 0, 1))
-        mock.assert_has_calls([call(["git.exe", "tag", "-a", "v2.0.1", "-m", "\"Version 2.0.1\""], env=ANY, shell=True),
-                               call(["git.exe", "push", "--tag"], env=ANY, shell=True)])
+        mock.assert_has_calls([call(["git.exe", "tag", "-a", "v2.0.1", "-m", "\"Version 2.0.1\""], env=ANY, shell=True)])
 
 class ReleaseTest(TestCase):
 
@@ -98,7 +97,7 @@ def createSourceWithVersion(self, text):
 
     def release(self, sources, scm, kind):
         release = Release(Distribution(), scm, sources)
-        release.runCommand = MagicMock()
+        release.run_command = MagicMock()
         release.type = kind
         release.run()
         return release
@@ -115,7 +114,7 @@ def testMicroRelease(self):
 
         release = self.release(sources, scm, "micro")
 
-        release.runCommand.assert_called_with(bdist_egg) 
+        release.run_command.assert_called_with("bdist_egg") 
         scm.tag.assert_called_once_with(Version(1, 3, 3))
         sources.readVersion.assert_called_once_with()
         sources.writeVersion.assert_called_once_with(Version(1, 3, 4))
@@ -127,7 +126,7 @@ def testMinorRelease(self):
 
         release = self.release(sources, scm, "minor")
 
-        release.runCommand.assert_called_with(bdist_egg) 
+        release.run_command.assert_called_with("bdist_egg") 
         sources.readVersion.assert_called_once_with()
         scm.tag.assert_called_once_with(Version(1, 4, 0))
         sources.writeVersion.assert_has_calls([call(Version(1, 4, 0)), call(Version(1,4,1))])
@@ -141,7 +140,7 @@ def testMajorRelease(self):
 
         release = self.release(sources, scm, "major")
 
-        release.runCommand.assert_called_with(bdist_egg) 
+        release.run_command.assert_called_with("bdist_egg") 
         sources.readVersion.assert_called_once_with()
         scm.tag.assert_called_once_with(Version(2, 0, 0))
         sources.writeVersion.assert_has_calls([call(Version(2, 0, 0)), call(Version(2,0,1))])