up version and reqs

This commit is contained in:
Daniel Tsvetkov 2019-12-09 15:26:11 +01:00
parent f02d39bfcb
commit d8fc988a1f
3 changed files with 18 additions and 37 deletions

View File

@ -3,31 +3,31 @@ from setuptools import setup
def gen_from_file(): def gen_from_file():
return ['backcall==0.1.0', return ['backcall==0.1.0',
'dateparser==0.7.1', 'dateparser==0.7.2',
'decorator==4.3.2', 'decorator==4.4.0',
'freezegun==0.3.11', 'freezegun==0.3.12',
'fuzzywuzzy==0.17.0', 'fuzzywuzzy==0.17.0',
'geographiclib==1.49', 'geographiclib==1.49',
'geopy==1.18.1', 'geopy==1.20.0',
'importlib-resources==1.0.2', 'importlib-resources==1.0.2',
'ipython==7.3.0', 'ipython==7.8.0',
'ipython-genutils==0.2.0', 'ipython-genutils==0.2.0',
'jedi==0.13.3', 'jedi==0.15.1',
'numpy==1.16.2', 'numpy==1.17.2',
'parso==0.3.4', 'parso==0.5.1',
'pexpect==4.6.0', 'pexpect==4.7.0',
'pickleshare==0.7.5', 'pickleshare==0.7.5',
'prompt-toolkit==2.0.9', 'prompt-toolkit==2.0.9',
'ptyprocess==0.6.0', 'ptyprocess==0.6.0',
'Pygments==2.3.1', 'Pygments==2.4.2',
'python-dateutil==2.8.0', 'python-dateutil==2.8.0',
'python-Levenshtein==0.12.0', 'python-Levenshtein==0.12.0',
'pytz==2018.9', 'pytz==2019.2',
'regex==2019.3.12', 'regex==2019.8.19',
'six==1.12.0', 'six==1.12.0',
'timezonefinder==4.0.1', 'timezonefinder==4.1.0',
'traitlets==4.3.2', 'traitlets==4.3.2',
'tzlocal==1.5.1', 'tzlocal==2.0.0',
'wcwidth==0.1.7', 'wcwidth==0.1.7',
'word2number==1.1'] 'word2number==1.1']
# with open("requirements.txt") as f: # with open("requirements.txt") as f:
@ -35,7 +35,7 @@ def gen_from_file():
setup(name='tww', setup(name='tww',
version='0.1', version='0.2',
description='Time When and Where', description='Time When and Where',
url='http://gitlab.com/pisquared/tww', url='http://gitlab.com/pisquared/tww',
author='Flying Circus', author='Flying Circus',

View File

@ -1,19 +0,0 @@
zurich,47.3666667,8.5500002
california,40.9066368,14.2958736
bulgaria,43.0,25.0
usa,39.7563889,46.7511101
brazil,-10.0,-55.0
sydney,-33.86785,151.2073212
sofia,42.6975135,23.3241463
eastern,-40.9597222,175.6575012
PT,40.44151435,-80.0100857539989
PT,40.44151435,-80.0100857539989
PT,40.44151435,-80.0100857539989
new york,40.7142691,-74.0059738
delhi,28.6666667,77.2166672
krivodol,43.389659,23.502923804029
vratsa,43.21,23.5625
plovdiv,42.15,24.75
studena,41.9158333,21.5305557
burdo,9.5166667,45.5333328
burgas,42.5,27.4666672
1 zurich 47.3666667 8.5500002
2 california 40.9066368 14.2958736
3 bulgaria 43.0 25.0
4 usa 39.7563889 46.7511101
5 brazil -10.0 -55.0
6 sydney -33.86785 151.2073212
7 sofia 42.6975135 23.3241463
8 eastern -40.9597222 175.6575012
9 PT 40.44151435 -80.0100857539989
10 PT 40.44151435 -80.0100857539989
11 PT 40.44151435 -80.0100857539989
12 new york 40.7142691 -74.0059738
13 delhi 28.6666667 77.2166672
14 krivodol 43.389659 23.502923804029
15 vratsa 43.21 23.5625
16 plovdiv 42.15 24.75
17 studena 41.9158333 21.5305557
18 burdo 9.5166667 45.5333328
19 burgas 42.5 27.4666672

View File

@ -228,7 +228,7 @@ def parse_query(query):
def serialize_location(location): def serialize_location(location):
return { return {
"name": location.name, "name": location.name if hasattr(location, 'name') else '',
"latitude": location.latitude, "latitude": location.latitude,
"longitude": location.longitude, "longitude": location.longitude,
} }