Skip to content

Commit d3e8cc2

Browse files
committed
git - Merge branch 'master' into export
Prepare branch to be merged into master
2 parents ab5ec51 + db8f80e commit d3e8cc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4797
-262
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!--- Verify first that your issue/request has not already been reported -->
2+
3+
##### Issue type
4+
<!--- Pick one below and delete the rest: -->
5+
- Bug Report
6+
- Feature Idea
7+
- Documentation Report
8+
9+
##### OverPy version
10+
<!--- Paste verbatim output from “python -c 'import overpy; print(overpy.__version__)'” or the hash of the git commit between quotes below. -->
11+
```
12+
13+
```
14+
15+
##### OS
16+
<!---
17+
Add information about the os you are using OverPy on.
18+
Pick one below and delete the rest:
19+
-->
20+
- Ubuntu 14.04
21+
- Ubuntu 16.04
22+
- Debian 8.0
23+
24+
#### Python version
25+
<!-- Pick at least one below and delete the rest -->
26+
27+
- Python 2.7
28+
- Python 3.2
29+
- Python 3.3
30+
- Python 3.4
31+
- Python 3.5
32+
33+
##### Summary
34+
<!--- Explain the problem briefly. -->
35+
36+
##### Steps to reproduce
37+
<!---
38+
Try to describe the steps how to reproduce the issue.
39+
-->
40+
41+
<!--- You can also add links to gist.github.com. -->
42+
43+
##### Expected results
44+
<!--- What did you expect to happen? -->
45+
46+
##### Actual results
47+
<!--- What actually happened? -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
##### Issue type
2+
<!--- Pick one below and delete the rest: -->
3+
- Feature
4+
- Bugfix
5+
- Documentation
6+
- ...
7+
8+
##### Summary
9+
<!--- Describe your change. -->
10+
11+
<!---
12+
If you are fixing an existing issue, please include also "Fixes #nnn" in your commit message.
13+
Please respect the preferred format of the commit message.
14+
-->

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ python:
55
- "3.2"
66
- "3.3"
77
- "3.4"
8+
- "3.5"
9+
- "3.6"
810
- "pypy"
911
- "pypy3"
1012

13+
before_install:
14+
- if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install 'coverage<4.0.0'; fi
15+
- pip install coveralls
16+
1117
install:
1218
- pip install .
13-
- pip install coveralls
1419
- pip install pytest-cov
1520

1621
script:

CHANGELOG.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
Changelog
22
=========
33

4+
0.x (`master`_)
5+
~~~~~~~~~~~~~~~
6+
7+
.. note:: This version is not yet released and is under development.
8+
9+
0.4 (2016-12-08)
10+
~~~~~~~~~~~~~~~~
11+
12+
* Add SAX parser
13+
* Add option to choose DOM or SAX parser
14+
* Fix issues with CI builds with Python 3.2
15+
* Add Python 3.5 to CI builds
16+
* Fix issues (Thanks to all contributors)
17+
* Add property for default API URL
18+
* Add examples
19+
* Build Fixes
20+
* GitHub templates
21+
* Parse center information
22+
* Parse geometry information
23+
* Support Areas
24+
425
0.3.1 (2015-04-30)
526
~~~~~~~~~~~~~~~~~~
627

CONTRIBUTING.rst

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
Contributing
2+
============
3+
4+
First of all, thank you for your interest in contributing to OverPy!
5+
6+
7+
Filing bug reports
8+
------------------
9+
10+
Bug reports are very welcome.
11+
Please fill them on the `GitHub issue tracker`_.
12+
Good bug reports come with extensive descriptions of the error and how to reproduce it.
13+
14+
15+
Patches
16+
-------
17+
18+
All patches to OverPy should be submitted in the form of pull requests to the main OverPy repository, `DinoTools/python-overpy`_.
19+
These pull requests should satisfy the following properties:
20+
21+
Code
22+
^^^^
23+
24+
- The pull request should focus on one particular improvement to OverPy.
25+
- Create different pull requests for unrelated features or bugfixes.
26+
- Python code should follow `PEP 8`_, especially in the "do what code around you does" sense.
27+
28+
Documentation
29+
^^^^^^^^^^^^^
30+
31+
When introducing new functionality, please remember to write documentation.
32+
33+
Tests
34+
^^^^^
35+
36+
It is recommended to add tests for new code you add.
37+
38+
Review
39+
------
40+
41+
Finally, pull requests must be reviewed before merging.
42+
Everyone can perform reviews; this is a very valuable way to contribute, and is highly encouraged.
43+
44+
45+
.. _GitHub issue tracker: https://github.com/DinoTools/python-overpy/issues
46+
.. _DinoTools/python-overpy: https://github.com/DinoTools/python-overpy
47+
.. _PEP 8: https://www.python.org/dev/peps/pep-0008/

MANIFEST.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
include README.rst CHANGELOG.rst
2+
include LICENSE
3+
include MANIFEST.in
4+
include docs/make.bat docs.Makefile
5+
include docs/source/conf.py
6+
include docs/source/*.rst
7+
include examples/*.py
8+
include tests/*.py
9+
include tests/json/*.json
10+
include tests/response/*.html
11+
include tests/xml/*.xml

docs/source/api.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Elements
2323
.. autoclass:: Element
2424
:members:
2525

26+
.. autoclass:: Area
27+
:members:
28+
2629
.. autoclass:: Node
2730
:members:
2831

@@ -39,6 +42,9 @@ Relation Members
3942
.. autoclass:: RelationMember
4043
:members:
4144

45+
.. autoclass:: RelationArea
46+
:members:
47+
4248
.. autoclass:: RelationNode
4349
:members:
4450

docs/source/contributing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.. include:: ../../CONTRIBUTING.rst

docs/source/example.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Lets start with an example from the Overpass API documentation.
3535
{}
3636
3737
Line 1:
38-
Import the required Pyhton module
38+
Import the required Python module
3939

4040
Line 2:
4141
Create a new instance of the Overpass() class.
@@ -257,4 +257,4 @@ Line 20-21:
257257
The function will return all Node elements connected with the Way element.
258258

259259
Line 22-25:
260-
The resolved nodes have been added to the result set and are available to be used again later.
260+
The resolved nodes have been added to the result set and are available to be used again later.

docs/source/faq.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Frequently Asked Questions
2+
==========================
3+
4+
429 Too Many Requests
5+
---------------------
6+
7+
If to many requests are send from the same IP address the server blocks some requests to avoid that a user uses up all resources.
8+
For more information have a look at the `Overpass API documentation <http://overpass-api.de/command_line.html>`_.
9+
10+
OverPy tries to fetch missing information automatically.
11+
To limit the number of requests you should try to fetch all required information/data(relations, ways, nodes, tags, ...) with the initial query.

0 commit comments

Comments
 (0)