diff options
| -rwxr-xr-x | calendar-cli.py | 5 | ||||
| -rw-r--r-- | metadata.py | 6 | ||||
| -rw-r--r-- | setup.py | 13 | ||||
| -rwxr-xr-x | tests/test_calendar-cli.sh | 2 |
4 files changed, 16 insertions, 10 deletions
diff --git a/calendar-cli.py b/calendar-cli.py index e0586f8..d4a932f 100755 --- a/calendar-cli.py +++ b/calendar-cli.py @@ -790,6 +790,11 @@ def main(): """ the main function does (almost) nothing but parsing command line parameters """ +# sys.stderr.write(""" +#The calendar-cli command is slowly being deprecated in favor of kal +#Check https://github.com/tobixen/calendar-cli/issues/88 +#""") + ## This boilerplate pattern is from ## http://stackoverflow.com/questions/3609852 ## We want defaults for the command line options to be fetched from the config file diff --git a/metadata.py b/metadata.py index 1d46a69..238249a 100644 --- a/metadata.py +++ b/metadata.py @@ -1,5 +1,5 @@ metadata = { - "version": "0.14.0dev", + "version": "0.14.0.dev0", "author": "Tobias Brox", "author_short": "tobixen", "copyright": "Copyright 2013-2022, Tobias Brox and contributors", @@ -9,5 +9,7 @@ metadata = { "author_email": "t-calendar-cli@tobixen.no", "status": "Development", "product": "calendar-cli", - "description": "high-level cli against caldav servers", + "name": "calendar-cli", + "description": "Simple command-line CalDav client, for adding and browsing calendar items, todo list items, etc.", + "url": "https://github.com/tobixen/calendar-cli", } @@ -5,16 +5,15 @@ import os from setuptools import setup, find_packages -import metadata +from metadata import metadata +metadata_ = metadata.copy() -metadata_ = {} -for attribute in ('version', 'author', 'author_email', 'license'): - metadata_[attribute] = getattr(metadata, '__%s__' % attribute) +for x in metadata: + if not x in ('author', 'version', 'license', 'maintainer', 'author_email', + 'status', 'name', 'description', 'url', 'description'): + metadata_.pop(x) setup( - name='calendar-cli', - description='Simple command-line CalDav client, for adding and browsing calendar items, todo list items, etc.', - url='https://github.com/tobixen/calendar-cli', #packages=['', # ], classifiers=[ diff --git a/tests/test_calendar-cli.sh b/tests/test_calendar-cli.sh index 8e408e2..e99546f 100755 --- a/tests/test_calendar-cli.sh +++ b/tests/test_calendar-cli.sh @@ -32,7 +32,7 @@ then read foo fi ./tests_kal.sh - #./tests.sh + ./tests.sh if [ -n "$DEBUG" ] then echo "press enter to take down test server" |