Skip to content

Commit

Permalink
Merge branch 'master' into 69_deprecate_capakey_soap
Browse files Browse the repository at this point in the history
* master:
  Update CHANGES
  Drop support for python 3.3, add for 3.6
  Update docs
  Correct default url instellen. Refs #45

Conflicts:
	CHANGES.rst
	docs/usage.rst
  • Loading branch information
Koen Van Daele committed Apr 19, 2017
2 parents 53a3a77 + 49e9569 commit 6a4f63f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,9 +2,9 @@ sudo: false
language: python
python:
- 2.7
- 3.3
- 3.4
- 3.5
- 3.6
install:
- easy_install -U setuptools
- pip install -r requirements-dev.txt
Expand Down
7 changes: 5 additions & 2 deletions CHANGES.rst
@@ -1,8 +1,11 @@
0.8.0 (??-??-2017)
0.8.0 (19-04-2017)
------------------

- Add Capakey REST gateway (#45)
- Added a CapakeyRestGateway that uses the new Capakey REST service provided by
Informatie Vlaanderen. (#45, #53)
- Deprecate Capakey SOAP gateway (#69)
- Fix a bug with list_huisnummers_by_perceel. (#67)
- Dropped support for Python 3.3 and added support for Python 3.6.

0.7.0 (25-01-2016)
------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/usage.rst
Expand Up @@ -98,10 +98,10 @@ regularly, so a short caching duration could easily be one hour or even a day.

See the examples folder for some more sample code.

.. _agiv: http://www.agiv.be
.. _dogpile: https://bitbucket.org/zzzeek/dogpile.cache

Be careful: the CAPAKEY SOAP gateway is deprecated. We advise you the use the CAPAKEY REST gateway instead.
.. warning::

Be careful: the CAPAKEY SOAP gateway is deprecated. We advise you the use the CAPAKEY REST gateway instead.

Using the CAPAKEY REST gateway
------------------------------
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -20,7 +20,7 @@

setup(
name='crabpy',
version='0.7.1',
version='0.8.0',
description='Interact with AGIV webservices.',
long_description=open('README.rst').read() + '\n\n' +
open('CHANGES.rst').read(),
Expand All @@ -45,9 +45,9 @@
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
test_suite='nose.collector'
)
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py33, py34, cover
envlist = py27, py34, py35, py36, cover

[testenv]
commands =
Expand Down

0 comments on commit 6a4f63f

Please sign in to comment.