[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-donations] 02/02: Merge branch 'master' of git.taler
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-donations] 02/02: Merge branch 'master' of git.taler.net:donations |
Date: |
Wed, 25 Sep 2019 21:27:56 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository donations.
commit 6a346edfe7fad92abbf6d7f6fc2e04602eff3d10
Merge: 3aeaaa7 38acb9f
Author: ng0 <address@hidden>
AuthorDate: Wed Sep 25 19:27:38 2019 +0000
Merge branch 'master' of git.taler.net:donations
.gitignore | 10 -
.style.yapf | 5 +
Makefile | 40 ++
Makefile.in | 55 --
README | 63 ++
.../taler-merchant-donations | 65 +--
bootstrap | 12 -
configure | 87 +++
configure.ac | 76 ---
Doxyfile => contrib/Doxyfile | 0
donations.conf | 20 +-
frontend-donations.wsgi.in | 21 -
m4/ax_compare_version.m4 | 177 ------
m4/python.m4 | 646 ---------------------
setup.py | 55 +-
talerdonations/donations/donations.py | 113 +++-
talerdonations/donations/templates/index.html | 17 +-
.../donations/templates/request_payment.html | 69 +++
talerdonations/tests.py | 1 +
19 files changed, 431 insertions(+), 1101 deletions(-)
diff --cc bin/taler-merchant-donations
index 74b0f59,ccf6a4e..628751b
--- a/bin/taler-merchant-donations
+++ b/bin/taler-merchant-donations
@@@ -26,21 -26,10 +26,10 @@@ import sy
import os
import site
import logging
-from talerdonations.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"))
-
# No perfect match to our logging format, but good enough ...
UWSGI_LOGFMT = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
- ## @endcond
##
diff --cc setup.py
index 1df9630,042635f..e1f0267
--- a/setup.py
+++ b/setup.py
@@@ -1,25 -1,27 +1,34 @@@
from setuptools import setup, find_packages
- setup(name='talerdonations',
- version='0.0',
- description='Example donations site for GNU Taler',
- url='git://taler.net/donations',
- author='Marcello Stanisci',
- author_email='address@hidden',
- license='GPL',
- packages=find_packages(),
- install_requires=["Flask>=0.10", "taler-util"],
- tests_require=["mock", "nose"],
- test_suite="nose.collector",
- package_data={
- '':[
- "donations/templates/*.html",
- "donations/static/*.svg",
- "donations/static/*.css",
- "donations/static/web-common/*.png",
- "donations/static/web-common/*.css",
- "donations/static/web-common/*.html",
- ]
- },
- scripts=['taler-merchant-donations'],
- zip_safe=False)
+ setup(
+ name='talerdonations',
+ version='0.6.0pre1',
+ description='Example donations site for GNU Taler',
+ url='git://taler.net/donations',
+ author=['Marcello Stanisci', 'Florian Dold'],
+ author_email=['address@hidden', 'address@hidden'],
+ license='GPL',
+ packages=find_packages(),
- install_requires=["Flask>=0.10", "requests", "uwsgi", "jsmin", "qrcode",
"lxml"],
- tests_require=["mock", "nose"],
++ install_requires=["Flask>=0.10",
++ "requests",
++ "uwsgi",
++ "jsmin",
++ "qrcode",
++ "lxml",
++ "taler-util"],
++ tests_require=["mock",
++ "nose"],
+ test_suite="nose.collector",
+ package_data={
+ '': [
+ "donations/templates/*.html",
+ "donations/static/*.svg",
+ "donations/static/*.css",
+ "donations/static/web-common/*.png",
+ "donations/static/web-common/*.css",
+ "donations/static/web-common/*.html",
+ ]
+ },
+ scripts=['./bin/taler-merchant-donations'],
+ zip_safe=False
+ )
diff --cc talerdonations/donations/donations.py
index a7b41c2,d85c9a9..9fd28c1
--- a/talerdonations/donations/donations.py
+++ b/talerdonations/donations/donations.py
@@@ -26,7 -26,11 +26,11 @@@ import rando
import requests
import flask
import traceback
+ import urllib
+ import qrcode
+ import qrcode.image.svg
+ import lxml.etree
-from ..talerconfig import TalerConfig
+from taler.util.talerconfig import TalerConfig
LOGGER = logging.getLogger(__name__)
--
To stop receiving notification emails like this one, please contact
address@hidden.