Skip to content

Commit bee5aa9

Browse files
authored
Merge pull request #49 from osmlab/dev
Merging dev > master
2 parents 2ea7300 + dbdf591 commit bee5aa9

3 files changed

Lines changed: 57 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
### Changelog
2+
3+
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
4+
5+
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
6+
7+
#### [v1.2.0](https://github.com/osmlab/maproulette-python-client/compare/v1.1.0...v1.2.0)
8+
9+
> 24 June 2020
10+
11+
- dev > master [`#46`](https://github.com/osmlab/maproulette-python-client/pull/46)
12+
- Add task and challenge endpoints [`#45`](https://github.com/osmlab/maproulette-python-client/pull/45)
13+
- Added new task and challenge methods [`1df0c9b`](https://github.com/osmlab/maproulette-python-client/commit/1df0c9bbcba4a801494938d9936f3bbb74fb675c)
14+
- Started adding task endpoints [`c3083a2`](https://github.com/osmlab/maproulette-python-client/commit/c3083a2adf766e5ef669fa8ec05e16a1598c603f)
15+
- Fixing formatting [`731e19c`](https://github.com/osmlab/maproulette-python-client/commit/731e19c2ff01acfc8379c01711cde36e5c31a8e5)
16+
17+
#### [v1.1.0](https://github.com/osmlab/maproulette-python-client/compare/v1.0.0...v1.1.0)
18+
19+
> 12 June 2020
20+
21+
- Merging dev > master [`#44`](https://github.com/osmlab/maproulette-python-client/pull/44)
22+
- Add priority rule model [`#41`](https://github.com/osmlab/maproulette-python-client/pull/41)
23+
- Add travis & pypi badges [`#42`](https://github.com/osmlab/maproulette-python-client/pull/42)
24+
- Add new properties [`#38`](https://github.com/osmlab/maproulette-python-client/pull/38)
25+
- Added new user methods [`#40`](https://github.com/osmlab/maproulette-python-client/pull/40)
26+
- Added enums [`a65566a`](https://github.com/osmlab/maproulette-python-client/commit/a65566affac5a9a311fca4099870cc0d8bbebc5d)
27+
- Add more challenge properties [`280d70c`](https://github.com/osmlab/maproulette-python-client/commit/280d70cc5e081f32213a13132ee6a9e54954f485)
28+
- Change properties [`6660f05`](https://github.com/osmlab/maproulette-python-client/commit/6660f058ce6ab99a93bd2efd778d9c7f1a4287c2)
29+
30+
#### v1.0.0
31+
32+
> 20 May 2020
33+
34+
- Merging dev -> master [`#39`](https://github.com/osmlab/maproulette-python-client/pull/39)
35+
- Add functionality for client-side certs [`#37`](https://github.com/osmlab/maproulette-python-client/pull/37)
36+
- Add new project api functionality [`#36`](https://github.com/osmlab/maproulette-python-client/pull/36)
37+
- Dev -> master [`#34`](https://github.com/osmlab/maproulette-python-client/pull/34)
38+
- Dev -> Master 0.1.0rc2 [`#33`](https://github.com/osmlab/maproulette-python-client/pull/33)
39+
- Read version from from __init__ [`#32`](https://github.com/osmlab/maproulette-python-client/pull/32)
40+
- Merging dev -> master [`#31`](https://github.com/osmlab/maproulette-python-client/pull/31)
41+
- Alpha release prep [`#30`](https://github.com/osmlab/maproulette-python-client/pull/30)
42+
- Refactor API module and add server health check [`#25`](https://github.com/osmlab/maproulette-python-client/pull/25)
43+
- Added docs for exceptions [`#23`](https://github.com/osmlab/maproulette-python-client/pull/23)
44+
- Added custom error class and removed/refactored endpoints affected by new MR release [`#20`](https://github.com/osmlab/maproulette-python-client/pull/20)
45+
- Add tests for remaining methods [`#19`](https://github.com/osmlab/maproulette-python-client/pull/19)
46+
- Build documentation using Sphinx [`#17`](https://github.com/osmlab/maproulette-python-client/pull/17)
47+
- [CI] PyPi publish on release [`#18`](https://github.com/osmlab/maproulette-python-client/pull/18)
48+
- GitHub Workflow for Publishing to Test-PyPi [`#16`](https://github.com/osmlab/maproulette-python-client/pull/16)
49+
- Adding new endpoint access and non-JSON-compliant output handling [`#15`](https://github.com/osmlab/maproulette-python-client/pull/15)
50+
- [Travis] Set tox python version to 3.6 [`#5`](https://github.com/osmlab/maproulette-python-client/pull/5)
51+
- Add tox to requirements.txt & PR template [`#4`](https://github.com/osmlab/maproulette-python-client/pull/4)
52+
- Build initial scaffolding for project [`#1`](https://github.com/osmlab/maproulette-python-client/pull/1)
53+
- Initial commit with scaffolding [`9bd6cbb`](https://github.com/osmlab/maproulette-python-client/commit/9bd6cbb5a9cf277a841a2b1add8ddccd6af4aac4)
54+
- Create LICENSE [`90af651`](https://github.com/osmlab/maproulette-python-client/commit/90af651113f97537c20ab8b6996305d2c1cb0335)
55+
- Add new features to project api [`04488da`](https://github.com/osmlab/maproulette-python-client/commit/04488dab8ba396bc05aa265ee748d129caec64ad)

maproulette/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
from .api.task import Task
1515
from .api.user import User
1616

17-
__version__ = '1.2.0'
17+
__version__ = '1.2.1'

maproulette/models/challenge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def to_dict(self):
352352
"overpassQL": self._overpassQL,
353353
"defaultPriority": self._default_priority,
354354
"highPriorityRule": self._high_priority_rule,
355-
"mediumPriorityTule": self._medium_priority_rule,
355+
"mediumPriorityRule": self._medium_priority_rule,
356356
"lowPriorityRule": self._low_priority_rule,
357357
"defaultZoom": self._default_zoom,
358358
"minZoom": self._min_zoom,

0 commit comments

Comments
 (0)