Update changelog and release v1.2.0

TwoWheelDev · Dec 10, 2014 · 5ab2571 · 5ab2571
1 parent 534a4fd
commit 5ab2571
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+1.2.0   Daniel Lintott  <[email protected]>
+
+    * Fix converting shapes that don't have fill_color specified, make them
+      transparent (Fixes #18)
+    * Copy instructions to new topology if they are present
+
 1.1.1   Daniel Lintott  <[email protected]>
 
     * Fix error numbering of multiple serial ports (Fixes #15)

diff --git a/docs/conf.py b/docs/conf.py
@@ -57,7 +57,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0-dev1'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/gns3converter/__init__.py b/gns3converter/__init__.py
@@ -12,4 +12,4 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.2.0-dev1'
+__version__ = '1.2.0'
diff --git a/tests/test_version.py b/tests/test_version.py
@@ -4,7 +4,7 @@
 
 class TestVersion(unittest.TestCase):
     def test_version(self):
-        self.assertEqual('1.2.0-dev1', gns3converter.__version__)
+        self.assertEqual('1.2.0', gns3converter.__version__)
 
 if __name__ == '__main__':
     unittest.main()