From 814d00bda87935a533af0647cd2afcf51e2513e8 Mon Sep 17 00:00:00 2001 From: Martijn van Exel Date: Mon, 17 Aug 2015 13:01:57 -0600 Subject: [PATCH] bump version, add dependencies to setup, bugs --- docs/conf.py | 4 ++-- maproulette/server.py | 3 +-- maproulette/task.py | 2 +- run_tests.py | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 38534a2..ea9ff0e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '0.2.6' +version = '0.2.7' # The full version, including alpha/beta/rc tags. -release = '0.2.6' +release = '0.2.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/maproulette/server.py b/maproulette/server.py index 914789b..fe89d0b 100644 --- a/maproulette/server.py +++ b/maproulette/server.py @@ -34,13 +34,12 @@ class MapRouletteServer(object): 'challenge_admin': '/admin/challenge/{slug}', 'tasks_admin': '/admin/challenge/{slug}/tasks' } - LOCAL_TEST_SERVER_ENDPOINT = 'http://localhost:5000/api' base_url = '' user = '' password = '' - def __init__(self, user, password, url=LOCAL_TEST_SERVER_ENDPOINT): + def __init__(self, user, password, url): self.base_url = url self.user = user self.password = password diff --git a/maproulette/task.py b/maproulette/task.py index f723a5a..578864a 100644 --- a/maproulette/task.py +++ b/maproulette/task.py @@ -65,7 +65,7 @@ def update(self, server): def exists(self, server): """Check if a task exists on the server""" try: - response = server.get( + server.get( 'task', replacements={ 'slug': self.__challenge__.slug, diff --git a/run_tests.py b/run_tests.py index bfa2344..437e12c 100644 --- a/run_tests.py +++ b/run_tests.py @@ -79,8 +79,8 @@ def test_007_task_exists(self): self.test_challenge_slug) task = MapRouletteTask( challenge=challenge, - identifier=self.test_task_identifier, - geometries=self.__random_point()) + identifier=self.test_task_identifier) + print task self.assertTrue(task.exists(self.server)) def test_008_create_a_ton_of_tasks(self):