[pyresample] 01/04: New upstream version 1.2.9

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository pyresample.

commit 94f3ab3c86471f3a0cc5658ec2ce38ded0538b20
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Wed Dec 14 21:21:20 2016 +0000

    New upstream version 1.2.9
---
 .bumpversion.cfg      |  2 +-
 .travis.yml           |  8 ++++++--
 changelog.rst         | 18 ++++++++++++++++++
 pyresample/version.py |  2 +-
 setup.py              |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d826b91..dfc5ee1 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.8
+current_version = 1.2.9
 commit = True
 tag = True
 
diff --git a/.travis.yml b/.travis.yml
index 54ebc06..481c053 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,17 +14,21 @@ install:
 - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install "matplotlib<1.5.0"; fi
 - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install unittest2; fi
 - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install importlib; fi
+- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install "sphinx<1.5.0"; fi
 - if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then pip install "matplotlib>=1.5.0"; fi
+- if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then pip install "sphinx>=1.5.0"; fi
 - if [[ $TRAVIS_PYTHON_VERSION == "3.3" ]]; then pip install "matplotlib<1.5.0"; fi
+- if [[ $TRAVIS_PYTHON_VERSION == "3.3" ]]; then pip install "sphinx<1.5.0"; fi
 - if [[ $TRAVIS_PYTHON_VERSION == "3.4" ]]; then pip install "matplotlib>=1.5.0"; fi
+- if [[ $TRAVIS_PYTHON_VERSION == "3.4" ]]; then pip install "sphinx>=1.5.0"; fi
 - if [[ $TRAVIS_PYTHON_VERSION == "3.5" ]]; then pip install "matplotlib>=1.5.0"; fi
+- if [[ $TRAVIS_PYTHON_VERSION == "3.5" ]]; then pip install "sphinx>=1.5.0"; fi
 - pip install -r requirements.txt
 - pip install -e ".[pykdtree,quicklook]"
 - pip install coveralls
-- pip install sphinx
 script:
 # Once doctests pass this should be uncommented to replace the other coverage run line
 - coverage run --source=pyresample setup.py test && cd docs && mkdir doctest && sphinx-build -E -n -b doctest ./source ./doctest
 after_success: coveralls
 notifications:
-  slack: pytroll:96mNSYSI1dBjGyzVXkBT6qFt
\ No newline at end of file
+  slack: pytroll:96mNSYSI1dBjGyzVXkBT6qFt
diff --git a/changelog.rst b/changelog.rst
index e8957e8..979a912 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,6 +1,24 @@
 Changelog
 =========
 
+v1.2.9 (2016-12-13)
+-------------------
+
+- update changelog. [Martin Raspaud]
+
+- Bump version: 1.2.8 → 1.2.9. [Martin Raspaud]
+
+- Merge pull request #52 from mitkin/mitkin-pr-setuptools32. [Martin
+  Raspaud]
+
+  Specify minimum version of setuptools
+
+- Specify minimum version of setuptools. [Mikhail Itkin]
+
+  Prior to version 3.2 setuptools would not recognize correctly the language of `*.cpp` extensions and would assume it's `*.c` no matter what. Version 3.2 of setuptools fixes that.
+
+- Fix sphinx dependency to support python 2.6 and 3.3. [Martin Raspaud]
+
 v1.2.8 (2016-12-06)
 -------------------
 
diff --git a/pyresample/version.py b/pyresample/version.py
index 02feda8..ef9842d 100644
--- a/pyresample/version.py
+++ b/pyresample/version.py
@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '1.2.8'
+__version__ = '1.2.9'
diff --git a/setup.py b/setup.py
index 07630a4..284b535 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ from setuptools.command.build_ext import build_ext as _build_ext
 
 version = imp.load_source('pyresample.version', 'pyresample/version.py')
 
-requirements = ['pyproj', 'numpy', 'configobj', 'pykdtree>=1.1.1']
+requirements = ['setuptools>=3.2', 'pyproj', 'numpy', 'configobj', 'pykdtree>=1.1.1']
 extras_require = {'pykdtree': ['pykdtree>=1.1.1'],
                   'numexpr': ['numexpr'],
                   'quicklook': ['matplotlib', 'basemap', 'pillow']}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyresample.git