This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pyosmium.
commit a64ab57fcea986b0a78a1c86da829cee5bccf806
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Aug 31 16:36:52 2015 +0200
Imported Upstream version 2.4.1
---
.travis.yml | 69 +++++++++++++++++++++++++++++++++++-------------------------
CHANGELOG.md | 12 +++++++++--
doc/conf.py | 4 ++--
setup.py | 2 +-
4 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 19a41aa..37dda0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,39 +6,50 @@
language: cpp
-compiler:
- - gcc
- - clang
+sudo: false
-env:
- - USE_PYTHON_VERSION=2
- - USE_PYTHON_VERSION=3
+matrix:
+ include:
+ - os: linux
+ compiler: clang
+ env: USE_PYTHON_VERSION=2
+ - os: linux
+ compiler: clang
+ env: USE_PYTHON_VERSION=3
+ - os: linux
+ compiler: gcc
+ env: USE_PYTHON_VERSION=2
+ - os: linux
+ compiler: gcc
+ env: USE_PYTHON_VERSION=3
-before_install:
- # upgrade compiler (we need at least g++-4.8 for C++11 features)
- - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- - sudo apt-get update --yes -qq
- - gcc_version=4.8
- - sudo apt-get install --yes gcc-${gcc_version} g++-${gcc_version}
- - gcc-${gcc_version} --version
- # make sure compiler executables point to the just installed version
- - sudo ln -sf /usr/bin/cpp-${gcc_version} /usr/bin/cpp
- - sudo ln -sf /usr/bin/gcc-${gcc_version} /usr/bin/gcc
- - sudo ln -sf /usr/bin/g++-${gcc_version} /usr/bin/g++
- # install dependencies
- - sudo apt-get install --yes make python3-dev python3 libboost-dev
libboost-python-dev libprotobuf-dev protobuf-compiler libsparsehash-dev
python-nose python3-nose
+# http://docs.travis-ci.com/user/apt/
+addons:
+ apt:
+ sources:
+ - boost-latest
+ - ubuntu-toolchain-r-test
+ packages:
+ - g++-4.8
+ - gcc-4.8
+ - libboost-python1.55-dev
+ - libboost1.55-dev
+ - libsparsehash-dev
+ - python-nose
+ - python3
+ - python3-dev
+ - python3-nose
install:
- - cd ..
- - git clone https://github.com/osmcode/libosmium.git
- - git clone https://github.com/scrosby/OSM-binary.git
- - cd OSM-binary/src
- - make
- - sudo make install
+ - git clone --quiet --depth 1 https://github.com/osmcode/libosmium.git
../libosmium
script:
- - cd $TRAVIS_BUILD_DIR
- - python${USE_PYTHON_VERSION} setup.py build
- - cd test
- - python${USE_PYTHON_VERSION} run_tests.py
+ - if [ "${CXX}" = 'g++' ]; then
+ CXX=g++-4.8;
+ CC=gcc-4.8;
+ fi
+ - python${USE_PYTHON_VERSION} --version
+ - python${USE_PYTHON_VERSION} setup.py build
+ - cd test
+ - python${USE_PYTHON_VERSION} run_tests.py
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d204bcf..1624941 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,13 @@ This project adheres to [Semantic
Versioning](http://semver.org/).
### Fixed
+## [2.4.1] - 2015-08-31
+
+### Changed
+
+- Use current libosmium
+
+
## [2.3.0] - 2015-08-18
### Changed
@@ -30,7 +37,8 @@ This project adheres to [Semantic
Versioning](http://semver.org/).
- Exception not caught in test.
-[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.3.0...HEAD
-[2.3.0]: https://github.com/osmcode/pyosmium/compare/v2.3.0...v2.3.0
+[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.4.1...HEAD
+[2.4.1]: https://github.com/osmcode/pyosmium/compare/v2.3.0...v2.4.1
+[2.3.0]: https://github.com/osmcode/pyosmium/compare/v2.2.0...v2.3.0
[2.2.0]: https://github.com/osmcode/pyosmium/compare/v2.1.0...v2.2.0
diff --git a/doc/conf.py b/doc/conf.py
index 75e6b74..de2cb6c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -63,9 +63,9 @@ copyright = '2015, Sarah Hoffmann'
# built documents.
#
# The short X.Y version.
-version = '2.3'
+version = '2.4'
# The full version, including alpha/beta/rc tags.
-release = '2.3.0'
+release = '2.4.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index b3f170b..ebf81bd 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ for ext in ('io', 'osm', 'index', 'geom'):
setup (name = 'pyosmium',
- version = '2.3.0',
+ version = '2.4.1',
description = 'Provides python bindings for libosmium.',
packages = packages,
ext_modules = extensions)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pyosmium.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
