aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-08-29 19:11:46 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2016-08-29 19:11:46 -0500
commit8274b1524f0a5467da13d3ee32401aea5083b0e0 (patch)
tree874e51ec8b1f1821c9eb8dc4ab9dcde6440b7751
parentfef8cc656cf7bbe7ef2e132d7c5b2f46a623084c (diff)
downloaduritemplates-8274b1524f0a5467da13d3ee32401aea5083b0e0.tar.gz
Release v2.0.0 of uritemplate
-rw-r--r--HISTORY.rst13
-rw-r--r--uritemplate/__init__.py2
2 files changed, 12 insertions, 3 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 65f7132..6d85cf8 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,5 +1,14 @@
-Changelog
-=========
+Changelog - uritemplate
+=======================
+
+2.0.0 - 2016-08-29
+------------------
+
+- Merge uritemplate.py into uritemplate
+
+
+Changelog - uritemplate.py
+==========================
2.0.0 - 2016-08-20
------------------
diff --git a/uritemplate/__init__.py b/uritemplate/__init__.py
index 97bb3dc..ab4bf1c 100644
--- a/uritemplate/__init__.py
+++ b/uritemplate/__init__.py
@@ -16,7 +16,7 @@ __title__ = 'uritemplate'
__author__ = 'Ian Cordasco'
__license__ = 'Modified BSD or Apache License, Version 2.0'
__copyright__ = 'Copyright 2013 Ian Cordasco'
-__version__ = '2.0.0rc2'
+__version__ = '2.0.0'
__version_info__ = tuple(int(i) for i in __version__.split('.') if i.isdigit())
from uritemplate.api import (