summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in3
-rwxr-xr-xsetup.py2
-rw-r--r--talerdonations/donations/donations.py4
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index c16dac2..38379a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,5 +49,4 @@ install: $(templates) install-data
.PHONY: check
check:
@export TALER_CONFIG_FILE=@abs_srcdir@/talerdonations/tests.conf; \
- export PYTHONPATH=@prefix@/lib/python@PYTHON_VERSION@/site-packages; \
- python3 talerdonations/tests.py
+ python3 setup.py test
diff --git a/setup.py b/setup.py
index 09cf479..f435e1c 100755
--- a/setup.py
+++ b/setup.py
@@ -9,6 +9,8 @@ setup(name='talerdonations',
license='GPL',
packages=find_packages(),
install_requires=["Flask>=0.10"],
+ tests_require=["mock", "nose"],
+ test_suite="nose.collector",
package_data={
'':[
"donations/templates/*.html",
diff --git a/talerdonations/donations/donations.py b/talerdonations/donations/donations.py
index 56a8c1e..9b3208a 100644
--- a/talerdonations/donations/donations.py
+++ b/talerdonations/donations/donations.py
@@ -23,8 +23,8 @@ import random
from datetime import datetime
import requests
import flask
-from talerdonations.talerconfig import TalerConfig
-from talerdonations.helpers import (make_url, \
+from ..talerconfig import TalerConfig
+from ..helpers import (make_url, \
expect_parameter, amount_from_float, \
amount_to_float, join_urlparts, get_query_string, \
MissingParameterException, backend_error)