From 186fe242d0a4bd69fc4e0a6e0bdb08921c227265 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 9 Oct 2019 11:16:31 -0700 Subject: [PATCH] Some cleanup/init/setup.py --- ptulsconv/__init__.py | 6 +++++- ptulsconv/__main__.py | 1 - ptulsconv/commands.py | 4 ++-- setup.py | 8 +++++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index ecb95e6..e5782c9 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -1,3 +1,7 @@ from .ptuls_grammar import protools_text_export_grammar from .ptuls_parser_visitor import DictionaryParserVisitor -from .transformations import TimecodeInterpreter \ No newline at end of file +from .transformations import TimecodeInterpreter + +__version__ = '0.0.1' +__author__ = 'Jamie Hardt' +__license__ = 'MIT' \ No newline at end of file diff --git a/ptulsconv/__main__.py b/ptulsconv/__main__.py index 48b4e03..ecc2bff 100644 --- a/ptulsconv/__main__.py +++ b/ptulsconv/__main__.py @@ -1,5 +1,4 @@ from ptulsconv.commands import convert -import ptulsconv.broadcast_timecode from optparse import OptionParser import sys diff --git a/ptulsconv/commands.py b/ptulsconv/commands.py index 53332c1..793b5ee 100644 --- a/ptulsconv/commands.py +++ b/ptulsconv/commands.py @@ -92,7 +92,7 @@ def fmp_dump(data, input_file_name, output): -def convert(input_file, format='fmp', start=None, end=None, output=sys.stdout): +def convert(input_file, format='fmpxml', start=None, end=None, output=sys.stdout): with open(input_file, 'r') as file: ast = ptulsconv.protools_text_export_grammar.parse(file.read()) dict_parser = ptulsconv.DictionaryParserVisitor() @@ -118,6 +118,6 @@ def convert(input_file, format='fmp', start=None, end=None, output=sys.stdout): if format == 'json': json.dump(parsed, output) - elif format == 'fmp': + elif format == 'fmpxml': fmp_dump(parsed, input_file, output) diff --git a/setup.py b/setup.py index eed8011..6999fbc 100644 --- a/setup.py +++ b/setup.py @@ -1,15 +1,17 @@ from setuptools import setup +from ptulsconv import __author__, __license__, __version__ + with open("README.md", "r") as fh: long_description = fh.read() setup(name='ptulsconv', - version='0.1', - author='Jamie Hardt', - author_email='jamiehardt@me.com', + version=__version__, + author=__author__, description='Parse and convert Pro Tools text exports', long_description_content_type="text/markdown", long_description=long_description, + license=__license__, url='https://github.com/iluvcapra/ptulsconv', project_urls={ 'Source':