From 31a30225fd4af06af72d0acf9522764f96ed3a51 Mon Sep 17 00:00:00 2001
From: Daniel Tsvetkov <danieltcv@gmail.com>
Date: Wed, 18 Mar 2020 12:06:53 +0100
Subject: [PATCH] update setup

---
 .gitignore       |  1 +
 requirements.txt |  2 +-
 setup.py         | 88 ++++++++++++++++++++++++------------------------
 src/main.py      |  2 +-
 4 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index aabd304..ca6e2e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ venv
 src/tww/data/.cache.csv
 __pycache__
 .idea
+tww.egg-info
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 0fd3d9d..86f3af1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 backcall==0.1.0
 chardet==3.0.4
-Click==7.0
+click==7.1.1
 dateparser==0.7.2
 DateTimeRange==0.6.1
 decorator==4.4.1
diff --git a/setup.py b/setup.py
index 67a5b1b..8e20596 100644
--- a/setup.py
+++ b/setup.py
@@ -2,56 +2,56 @@ from setuptools import setup
 
 
 def gen_from_file():
-    return [
-        'backcall==0.1.0',
-        'chardet==3.0.4',
-        'Click==7.0',
-        'dateparser==0.7.2',
-        'DateTimeRange==0.6.1',
-        'decorator==4.4.1',
-        'Flask==1.1.1',
-        'freezegun==0.3.14',
-        'fuzzywuzzy==0.18.0',
-        'geographiclib==1.50',
-        'geopy==1.21.0',
-        'importlib-resources==1.0.2',
-        'ipython==7.12.0',
-        'ipython-genutils==0.2.0',
-        'isodate==0.6.0',
-        'itsdangerous==1.1.0',
-        'jedi==0.16.0',
-        'Jinja2==2.11.1',
-        'MarkupSafe==1.1.1',
-        'mbstrdecoder==0.8.4',
-        'numpy==1.18.1',
-        'parso==0.6.1',
-        'pexpect==4.8.0',
-        'pickleshare==0.7.5',
-        'prompt-toolkit==3.0.3',
-        'ptyprocess==0.6.0',
-        'Pygments==2.5.2',
-        'python-dateutil==2.8.1',
-        'python-Levenshtein==0.12.0',
-        'pytz==2019.3',
-        'regex==2020.1.8',
-        'six==1.14.0',
-        'timezonefinder==4.2.0',
-        'traitlets==4.3.3',
-        'typepy==0.6.5',
-        'tzlocal==2.0.0',
-        'wcwidth==0.1.8',
-        'Werkzeug==1.0.0',
-        'word2number==1.1',
-    ]
-    # with open("requirements.txt") as f:
-    #     return [line.strip() for line in f.readlines()]
+    # return [
+    #     'backcall==0.1.0',
+    #     'chardet==3.0.4',
+    #     'Click==7.0',
+    #     'dateparser==0.7.2',
+    #     'DateTimeRange==0.6.1',
+    #     'decorator==4.4.1',
+    #     'Flask==1.1.1',
+    #     'freezegun==0.3.14',
+    #     'fuzzywuzzy==0.18.0',
+    #     'geographiclib==1.50',
+    #     'geopy==1.21.0',
+    #     'importlib-resources==1.0.2',
+    #     'ipython==7.12.0',
+    #     'ipython-genutils==0.2.0',
+    #     'isodate==0.6.0',
+    #     'itsdangerous==1.1.0',
+    #     'jedi==0.16.0',
+    #     'Jinja2==2.11.1',
+    #     'MarkupSafe==1.1.1',
+    #     'mbstrdecoder==0.8.4',
+    #     'numpy==1.18.1',
+    #     'parso==0.6.1',
+    #     'pexpect==4.8.0',
+    #     'pickleshare==0.7.5',
+    #     'prompt-toolkit==3.0.3',
+    #     'ptyprocess==0.6.0',
+    #     'Pygments==2.5.2',
+    #     'python-dateutil==2.8.1',
+    #     'python-Levenshtein==0.12.0',
+    #     'pytz==2019.3',
+    #     'regex==2020.1.8',
+    #     'six==1.14.0',
+    #     'timezonefinder==4.2.0',
+    #     'traitlets==4.3.3',
+    #     'typepy==0.6.5',
+    #     'tzlocal==2.0.0',
+    #     'wcwidth==0.1.8',
+    #     'Werkzeug==1.0.0',
+    #     'word2number==1.1',
+    # ]
+    with open("requirements.txt") as f:
+        return [line.strip() for line in f.readlines()]
 
 
 setup(name='tww',
       version='0.2',
       description='Time When and Where',
       url='http://gitlab.com/pisquared/tww',
-      author='Flying Circus',
+      author='Daniel Tsvetkov',
       install_requires=gen_from_file(),
       author_email='',
       license='MIT',
diff --git a/src/main.py b/src/main.py
index faf41c4..14373da 100644
--- a/src/main.py
+++ b/src/main.py
@@ -3,4 +3,4 @@ from tww.tokenizer import parse_args, setup_logging_level, main
 if __name__ == "__main__":
     args = parse_args()
     setup_logging_level(args.debug)
-    main(args)
\ No newline at end of file
+    main(args)