Merge pull request RIPE-NCC#131 from danielquinn/next-release

Next release housekeeping
danielquinn · Dec 15, 2015 · 92b7c31 · 92b7c31
2 parents aaf106e + eeb5b03
commit 92b7c31
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,15 @@
 Release History
 ===============
 
+1.2.0 (released 2015-12-15)
+---------------------------
+
+Output Changes
+~~~~~~~~~~~~~~
+- `#119`_: Support HTTP results.
+- `#122`_: Allow packagers to set the user agent.
+
+
 1.1.1 (released 2015-11-25)
 ---------------------------
 
@@ -37,3 +46,5 @@ Changes
 
 .. _#103: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/103
 .. _#105: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/105
+.. _#119: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/119
+.. _#122: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/122
diff --git a/ripe/atlas/tools/version.py b/ripe/atlas/tools/version.py
@@ -13,4 +13,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.1.1"
+__version__ = "1.2.0"
diff --git a/setup.py b/setup.py
@@ -33,8 +33,8 @@
     install_requires=[
         "python-dateutil",
         "requests>=2.7.0",
-        "ripe.atlas.cousteau>=1.0.4",
-        "ripe.atlas.sagan>=1.1.6",
+        "ripe.atlas.cousteau>=1.0.6",
+        "ripe.atlas.sagan>=1.1.8",
         "tzlocal",
         "pyyaml",
         "pyOpenSSL>=0.13",