Skip to content

Commit b7fc3cb

Browse files
yzalbjyzalbj
committed
support python 3.8
1 parent f2d68d3 commit b7fc3cb

File tree

3 files changed

+73
-24
lines changed

3 files changed

+73
-24
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ virtualenv
44
*.egg-info
55
build
66
dist
7-
.pypirc
7+
.pypirc
8+
.venv

‎setup.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import os
44
from setuptools import setup
55

6+
VERSION = "0.3.0"
7+
68
# Utility function to read the README file.
79
# Used for the long_description. It's nice, because now 1) we have a top level
810
# README file and 2) it's easier to type in the README file than to put a raw
@@ -13,15 +15,15 @@ def read(fname):
1315
setup(
1416
name = "ticketrenderer",
1517
packages = ["ticketrenderer"],
16-
version = "0.2.8",
18+
version = VERSION,
1719
author = "Benoît Guigal",
1820
author_email = "[email protected]",
1921
description = ("A library used to render Figure tickets from ticket templates"),
2022
url = "https://github.com/Postcard/ticket-renderer-python",
21-
download_url = 'https://github.com/Postcard/ticket-renderer-python/tarball/0.2.7',
23+
download_url = f'https://github.com/Postcard/ticket-renderer-python/tarball/{VERSION}',
2224
py_modules=('ticketrenderer',),
2325
install_requires=[
24-
'jinja2>=2.7.3',
25-
'mock==1.0.1'
26+
'jinja2>=3.0.2',
27+
'mock==4.0.3'
2628
]
2729
)

‎ticketrenderer/tests.py‎

Lines changed: 65 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ def test_render(self):
4747
}
4848
ticket_renderer = TicketRenderer(template, self.media_url, self.css_url)
4949
code = 'SJ98H'
50-
date = datetime(2016, 01, 01)
50+
date = datetime(2016, 0o1, 0o1)
5151
picture = 'http://path/to/picture'
5252
place = {
5353
'name': 'Place name',
5454
'code': 'PPPP'
5555
}
5656
event = {
5757
'name': 'Event name',
58-
'code': 'EEEE'
58+
'code': 'EEEE',
59+
'portraits_expiration': 30
5960
}
6061
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=0, place=place, event=event)
6162
self.assertIn("http://path/to/picture", rendered)
@@ -100,24 +101,33 @@ def test_render_sequential(self):
100101
}
101102
ticket_renderer = TicketRenderer(template, self.media_url, self.css_url)
102103
code = 'SJ98H'
103-
date = datetime(2016, 01, 01)
104+
date = datetime(2016, 0o1, 0o1)
105+
place = {
106+
'name': 'Place name',
107+
'code': 'PPPP'
108+
}
109+
event = {
110+
'name': 'Event name',
111+
'code': 'EEEE',
112+
'portraits_expiration': 30
113+
}
104114
picture = 'http://path/to/picture'
105-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=0)
115+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=0, place=place, event=event)
106116
self.assertIn('Titi', rendered)
107117
self.assertIn('image1', rendered)
108-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=1)
118+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=1, place=place, event=event)
109119
self.assertIn('Vicky', rendered)
110120
self.assertIn('image2', rendered)
111-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=2)
121+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=2, place=place, event=event)
112122
self.assertIn('Benni', rendered)
113123
self.assertIn('image1', rendered)
114-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=3)
124+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=3, place=place, event=event)
115125
self.assertIn('Titi', rendered)
116126
self.assertIn('image2', rendered)
117-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=4)
127+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=4, place=place, event=event)
118128
self.assertIn('Vicky', rendered)
119129
self.assertIn('image1', rendered)
120-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=5)
130+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=5, place=place, event=event)
121131
self.assertIn('Benni', rendered)
122132
self.assertIn('image2', rendered)
123133

@@ -137,9 +147,18 @@ def test_render_no_variables_no_title_no_description(self):
137147
}
138148
ticket_renderer = TicketRenderer(template, self.media_url, self.css_url)
139149
code = 'SJ98H'
140-
date = datetime(2016, 01, 01)
150+
date = datetime(2016, 0o1, 0o1)
151+
place = {
152+
'name': 'Place name',
153+
'code': 'PPPP'
154+
}
155+
event = {
156+
'name': 'Event name',
157+
'code': 'EEEE',
158+
'portraits_expiration': 30
159+
}
141160
picture = 'http://path/to/picture'
142-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=0)
161+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=0, place=place, event=event)
143162
self.assertIn("http://path/to/picture", rendered)
144163
self.assertIn(code, rendered)
145164
self.assertIn("http://static/ticket.css", rendered)
@@ -161,9 +180,18 @@ def test_render_no_items_in_variable(self):
161180
}
162181
ticket_renderer = TicketRenderer(template, self.media_url, self.css_url)
163182
code = 'SJ98H'
164-
date = datetime(2016, 01, 01)
183+
date = datetime(2016, 0o1, 0o1)
184+
place = {
185+
'name': 'Place name',
186+
'code': 'PPPP'
187+
}
188+
event = {
189+
'name': 'Event name',
190+
'code': 'EEEE',
191+
'portraits_expiration': 30
192+
}
165193
picture = 'http://path/to/picture'
166-
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=0)
194+
rendered = ticket_renderer.render(code=code, date=date, picture=picture, counter=0, place=place, event=event)
167195
self.assertIn("http://path/to/picture", rendered)
168196
self.assertIn(code, rendered)
169197
self.assertIn("http://static/ticket.css", rendered)
@@ -183,17 +211,26 @@ def test_set_date_format(self):
183211
}
184212
ticket_renderer = TicketRenderer(template, self.media_url, self.css_url)
185213
code = 'SJ98H'
186-
date = datetime(2010, 01, 01)
214+
date = datetime(2010, 0o1, 0o1)
215+
place = {
216+
'name': 'Place name',
217+
'code': 'PPPP'
218+
}
219+
event = {
220+
'name': 'Event name',
221+
'code': 'EEEE',
222+
'portraits_expiration': 30
223+
}
187224
picture = 'http://path/to/picture'
188-
rendered_html = ticket_renderer.render(code=code, date=date, picture=picture, counter=0)
225+
rendered_html = ticket_renderer.render(code=code, date=date, picture=picture, counter=0, place=place, event=event)
189226
assert "2010/01/01" in rendered_html
190227

191228

192229
def test_encode_non_unicode_character(self):
193230
"""
194231
Ticket renderer should encode non unicode character
195232
"""
196-
html = u"Du texte avec un accent ici: é"
233+
html = "Du texte avec un accent ici: é"
197234
template = {
198235
'html': html,
199236
'images': [],
@@ -204,10 +241,19 @@ def test_encode_non_unicode_character(self):
204241
}
205242
ticket_renderer = TicketRenderer(template, self.media_url, self.css_url)
206243
code = 'SJ98H'
207-
date = datetime(2010, 01, 01)
244+
date = datetime(2010, 0o1, 0o1)
245+
place = {
246+
'name': 'Place name',
247+
'code': 'PPPP'
248+
}
249+
event = {
250+
'name': 'Event name',
251+
'code': 'EEEE',
252+
'portraits_expiration': 30
253+
}
208254
picture = 'http://path/to/picture'
209-
rendered_html = ticket_renderer.render(code=code, date=date, picture=picture, counter=0)
210-
assert u'Du texte avec un accent ici: é' in rendered_html
255+
rendered_html = ticket_renderer.render(code=code, date=date, picture=picture, counter=0, place=place, event=event)
256+
assert 'Du texte avec un accent ici: é' in rendered_html
211257

212258

213259
if __name__ == '__main__':

0 commit comments

Comments
 (0)