[GNUnet-SVN] [taler-survey] 02/02: Merge branch 'master' of git.taler.net:survey

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository survey.

commit 107efba7d60ff0a3d56b48661d70d5842395a836
Merge: eeff7db 498b143
Author: ng0 <address@hidden>
AuthorDate: Wed Sep 25 18:04:04 2019 +0000

    Merge branch 'master' of git.taler.net:survey

 .gitignore                                         |  13 +-
 .style.yapf                                        |   5 +
 Makefile                                           |  40 ++
 Makefile.in                                        |  56 --
 README                                             |  63 ++
 .../taler-merchant-survey                          |  58 +-
 bootstrap                                          |  12 -
 configure                                          |  87 +++
 configure.ac                                       |  79 ---
 Doxyfile => contrib/Doxyfile                       |   0
 frontend-survey.wsgi.in                            |  21 -
 m4/ax_compare_version.m4                           | 177 ------
 m4/python.m4                                       | 646 ---------------------
 setup.py                                           |  58 +-
 talersurvey/survey/survey.py                       | 127 ++--
 talersurvey/survey/templates/index.html            |   6 +-
 talersurvey/survey/templates/show_tip.html         |  35 ++
 talersurvey/tests.py                               |   1 +
 18 files changed, 380 insertions(+), 1104 deletions(-)

diff --cc bin/taler-merchant-survey
index 254ff7f,41e6637..3462ca5
mode 100644,100755..100755
--- a/bin/taler-merchant-survey
+++ b/bin/taler-merchant-survey
@@@ -26,17 -26,8 +26,8 @@@ import sy
  import os
  import site
  import logging
 -from talersurvey.talerconfig import TalerConfig
 +from taler.util.talerconfig import TalerConfig
  
- os.environ.setdefault("TALER_PREFIX", "@prefix@")
- site.addsitedir("%s/lib/python%d.%d/site-packages" % (
-     "@prefix@",
-     sys.version_info.major,
-     sys.version_info.minor))
- 
- 
- ## @cond
- TC = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
  LOGGER = logging.getLogger(__name__)
  # No perfect match to our logging format, but good enough ...
  UWSGI_LOGFMT = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
diff --cc setup.py
index 3daed2c,01425ac..612ea9d
--- a/setup.py
+++ b/setup.py
@@@ -1,30 -1,32 +1,32 @@@
  from setuptools import setup, find_packages
  
- setup(name='talersurvey',
-       version='0.0',
-       description='Example survey site for GNU Taler',
-       url='git://taler.net/survey',
-       author='Marcello Stanisci',
-       author_email='address@hidden',
-       license='GPL',
-       packages=find_packages(),
-       install_requires=["Flask>=0.10", "taler-util"],
-       test_suite="nose.collector",
-       tests_require=["mock", "nose"],
-       package_data={
-           '':[
-               "survey/templates/*.html",
-               "survey/static/favicon.ico",
-               "survey/static/*.svg",
-               "survey/static/*.css",
-               "survey/static/*.js",
-               "survey/static/*.js.tar.gz",
-               "survey/static/web-common/*.png",
-               "survey/static/web-common/*.css",
-               "survey/static/web-common/*.js",
-               "survey/static/web-common/*.js.tar.gz",
-               "survey/static/web-common/*.html",
-       ]
-       },
-       scripts=['taler-merchant-survey'],
-       zip_safe=False)
+ setup(
+     name='talersurvey',
+     version='0.6.0pre1',
+     description='Example survey site for GNU Taler',
+     url='git://taler.net/survey',
+     author='Marcello Stanisci',
+     author_email='address@hidden',
+     license='GPL',
+     packages=find_packages(),
 -    install_requires=["Flask>=0.10", "jsmin"],
++    install_requires=["Flask>=0.10", "jsmin", "taler-util"],
+     test_suite="nose.collector",
+     tests_require=["mock", "nose", "requests", "uwsgi", "qrcode", "lxml"],
+     package_data={
+         '': [
+             "survey/templates/*.html",
+             "survey/static/favicon.ico",
+             "survey/static/*.svg",
+             "survey/static/*.css",
+             "survey/static/*.js",
+             "survey/static/*.js.tar.gz",
+             "survey/static/web-common/*.png",
+             "survey/static/web-common/*.css",
+             "survey/static/web-common/*.js",
+             "survey/static/web-common/*.js.tar.gz",
+             "survey/static/web-common/*.html",
+         ]
+     },
+     scripts=['./bin/taler-merchant-survey'],
+     zip_safe=False
+ )
diff --cc talersurvey/survey/survey.py
index 897c4bf,14e2258..a016a9f
--- a/talersurvey/survey/survey.py
+++ b/talersurvey/survey/survey.py
@@@ -26,7 -26,10 +26,10 @@@ from urllib.parse import urljoi
  import flask
  import requests
  import traceback
+ import qrcode
+ import qrcode.image.svg
+ import lxml.etree
 -from ..talerconfig import TalerConfig
 +from taler.util.talerconfig import TalerConfig
  
  BASE_DIR = os.path.dirname(os.path.abspath(__file__))
  app = flask.Flask(__name__, template_folder=BASE_DIR)

-- 
To stop receiving notification emails like this one, please contact
address@hidden.