Fixed regex statements in parser

This clears up a bunch of `DeprecationWarning`s in pytest

.github/workflows/pythonpublish.yml

@@ -22,8 +22,8 @@ jobs:
         pip install parsimonious
     - name: Build and publish
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_API_KEY }}
       run: |
         python setup.py sdist bdist_wheel
         twine upload dist/*

ptulsconv/__init__.py

@@ -1,5 +1,6 @@
 from ptulsconv.docparser.ptuls_grammar import protools_text_export_grammar
 
-__version__ = '1.0.0'
+__version__ = '1.0.1'
 __author__  = 'Jamie Hardt'
 __license__ = 'MIT'
+__copyright__ = "%s %s (c) 2022 %s. All rights reserved." % (__name__, __version__, __author__)

ptulsconv/__main__.py

@@ -2,7 +2,7 @@ from optparse import OptionParser, OptionGroup
 import datetime
 import sys
 
-from ptulsconv import __name__, __version__, __author__
+from ptulsconv import __name__, __version__, __author__,__copyright__
 from ptulsconv.commands import convert
 from ptulsconv.reporting import print_status_style, print_banner_style, print_section_header_style, print_fatal_error
 
@@ -59,9 +59,10 @@ def main():
 
     parser.add_option_group(informational_options)
 
+    print_banner_style(__copyright__)
+    
     (options, args) = parser.parse_args(sys.argv)
 
-    print_banner_style("%s %s (c) 2022 %s. All rights reserved." % (__name__, __version__, __author__))
 
     print_section_header_style("Startup")
     print_status_style("This run started %s" % (datetime.datetime.now().isoformat()))

ptulsconv/docparser/ptuls_grammar.py

@@ -67,8 +67,8 @@ protools_text_export_grammar = Grammar(
     fs = "\t"
     rs = "\n"
     block_ending = rs rs
-    string_value   = ~"[^\t\n]*"
-    integer_value  = ~"\d+"
-    float_value    = ~"\d+(\.\d+)?"
-    isp            = ~"[^\d\t\n]*"    
+    string_value   = ~r"[^\t\n]*"
+    integer_value  = ~r"\d+"
+    float_value    = ~r"\d+(\.\d+)?"
+    isp            = ~r"[^\d\t\n]*"    
     """)

ptulsconv/docparser/tagged_string_parser_visitor.py

@@ -18,11 +18,11 @@ tag_grammar = Grammar(
     key_tag        = "[" key "]" word_sep?
     short_tag      = "$" key "=" word word_sep?
     full_text_tag  = "{" key "=" value "}" word_sep?
-    key            = ~"[A-Za-z][A-Za-z0-9_]*"
-    value          = ~"[^}]+"
+    key            = ~r"[A-Za-z][A-Za-z0-9_]*"
+    value          = ~r"[^}]+"
     tag_junk       = word word_sep?
-    word           = ~"[^ \[\{\$][^ ]*"
-    word_sep       = ~" +"
+    word           = ~r"[^ \[\{\$][^ ]*"
+    word_sep       = ~r" +"
     modifier       = ("@" / "&") word_sep?
     """
 )