From 6913306d3af073c533d1f03e9f5033c494b3a731 Mon Sep 17 00:00:00 2001
From: Stephane Raynaud <stephane.raynaud@shom.fr>
Date: Mon, 2 Jul 2018 09:47:28 +0200
Subject: [PATCH] Version 3.6.0

---
 CHANGES.rst                   | 31 +++++++++++++++++++++++++++++++
 lib/python/vacumm/__init__.py | 18 ++++++++++++++----
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 890a366..508ebac 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,37 @@
 Release notes
 #############
 
+Version 3.6.0
+=============
+
+- Added support for scipy interpolations in griddata and xy2xy
+  with use of projected coordinates
+- Added tuple support to create_axes2d
+- Added basic_proj and use it as default projection
+- Added GriddedSelector
+- Added some support for unstructured grids: create_ugrid, get_tri,
+  get_tri_mask, get_tri_type, create_ugrid, create_aux_axes,
+  get_unstruct_indices, create_grid, get_grid_type, issgrid, isugrid
+- Added are_same_grids
+- Added fill support to Plot.Add_box
+- Removed support for css and nat interpolations in griddata and xy2xy
+- Fixed time cdtimes comparisons
+- Fixed core_plot x/y attr check
+- Fixed call to udunits
+- Fixed linear4dto1dxx
+- Fixed check_case
+- Fixed Fix XYZ.togrid
+- Fixed bugs due to new MPL
+- Fixed regrid1d with cellave
+- Fixed quiverkey_value
+- Fixed import in stats
+- Fixed gaussian2d
+- Fixed extend1d inner slice and cyclic conditions
+- Fixed cellerr1d errm slices
+- Fixed output dim check in grid2xy
+- Fixed lat/lon in Map
+- Fixed coord2slice with e/n bounds specs
+
 Version 3.5.1
 =============
 
diff --git a/lib/python/vacumm/__init__.py b/lib/python/vacumm/__init__.py
index 56f7c90..e522634 100644
--- a/lib/python/vacumm/__init__.py
+++ b/lib/python/vacumm/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf8 -*-
 #
-# Copyright or © or Copr. Actimar/IFREMER (2010-2017)
+# Copyright or © or Copr. Actimar/IFREMER (2010-2018)
 #
 # This software is a computer program whose purpose is to provide
 # utilities for handling oceanographic and atmospheric data,
@@ -37,11 +37,11 @@
 from warnings import warn
 
 __project__ = 'vacumm'
-__version__ = '3.5.1'
+__version__ = '3.6.0'
 __release__ = '0'
-__date__ = '2017-12-12'
+__date__ = '2018-07-02'
 __author__ = u'Stéphane Raynaud, Jonathan Wilkins, Guillaume Charria'
-__email__ = 'raynaud@actimar.fr, wilkins@actimar.fr, charria@ifremer.fr'
+__email__ = 'stephane.raynaud@gmail.com, wilkins@actimar.fr, charria@ifremer.fr'
 __copyright__ = 'Copyright (c) 2010-2016 Actimar/IFREMER'
 __description__ = """
 VACUMM library
@@ -96,8 +96,18 @@ class VACUMMError(Exception):
 class VACUMMWarning(UserWarning):
     """Standard VACUMM warning"""
 
+class VACUMMDepWarning(DeprecationWarning, VACUMMWarning):
+    """Deprecation VACUMM warning"""
+
+
 def vacumm_warn(message, stacklevel=2):
     """Issue a :class:`VACUMMWarning`"""
     warn(message, VACUMMWarning, stacklevel=stacklevel)
 
 vcwarn = vacumm_warning = vacumm_warn
+
+def vacumm_dep_warn(message, stacklevel=2):
+    """Issue a :class:`VACUMMDepWarning`"""
+    warn(message, VACUMMDepWarning, stacklevel=stacklevel)
+
+vcdwarn = vacumm_dep_warning = vacumm_dep_warn