This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pyosmium.
commit 758d3810aa00929d24e5659c82ce76cf748771dc
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Jul 4 16:50:50 2015 +0200
Imported Upstream version 2.2.0
---
CHANGELOG.md | 27 +++++++++++++++++++++++++++
README.md | 2 +-
doc/conf.py | 4 ++--
setup.py | 2 +-
test/test_io.py | 2 +-
5 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..893d83f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,27 @@
+
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [unreleased] -
+
+### Added
+
+### Changed
+
+### Fixed
+
+## [2.2.0] - 2015-07-04
+
+### Changed
+
+- Use current libosmium
+
+### Fixed
+
+- Exception not caught in test.
+
+[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/osmcode/pyosmium/compare/v2.1.0...v2.2.0
+
diff --git a/README.md b/README.md
index 3e6a983..494dcc8 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ The suite can be run with:
To build the documentation you need [Sphinx](http://sphinx-doc.org/).
On Debian/Ubuntu install `python-sphinx` or `python3-sphinx`.
-Then run:
+First compile the bindings as described above and then run:
cd doc
make html
diff --git a/doc/conf.py b/doc/conf.py
index 883b890..a21216b 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.1'
+version = '2.2'
# The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2.2.0'
# 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 ff55d46..29058ae 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ for ext in ('io', 'osm', 'index', 'geom'):
setup (name = 'pyosmium',
- version = '0.1',
+ version = '2.2.0',
description = 'Provides python bindings for libosmium.',
packages = packages,
ext_modules = extensions)
diff --git a/test/test_io.py b/test/test_io.py
index 91db118..f9435d0 100644
--- a/test/test_io.py
+++ b/test/test_io.py
@@ -43,7 +43,7 @@ class TestReaderFromFile(unittest.TestCase):
rd = o.io.Reader(fn)
with assert_raises(ValueError):
o.apply(rd, o.SimpleHandler())
- rd.close()
+ rd.close()
finally:
os.remove(fn)
--
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
