From 87108c7865e69141570f2517470d1e81e82f9c62 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Tue, 15 Nov 2022 10:28:42 -0800 Subject: [PATCH 1/6] Update __init__.py Bump version --- ptulsconv/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index 27e8aca..b671e4a 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -1,6 +1,6 @@ from ptulsconv.docparser.ptuls_grammar import protools_text_export_grammar -__version__ = '1.0.4' +__version__ = '1.0.5' __author__ = 'Jamie Hardt' __license__ = 'MIT' __copyright__ = "%s %s (c) 2022 %s. All rights reserved." % (__name__, __version__, __author__) From d3cc9074c414c2f980f822712ca2b2dffefd524f Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Tue, 15 Nov 2022 11:27:18 -0800 Subject: [PATCH 2/6] Update pythonpublish.yml --- .github/workflows/pythonpublish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index 64264ca..870006f 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -2,7 +2,7 @@ name: Upload Python Package on: release: - types: [created] + types: [published] jobs: deploy: From c0d192e651e61145ba9e09aa2edca3056f7cc763 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Tue, 15 Nov 2022 11:47:46 -0800 Subject: [PATCH 3/6] Delete test-coverage.sh --- test-coverage.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 test-coverage.sh diff --git a/test-coverage.sh b/test-coverage.sh deleted file mode 100755 index 5b7dca1..0000000 --- a/test-coverage.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -coverage run -m pytest . ; coverage-lcov - From d3b08e92386cfa1d4f2eae7b6f5d016b7ef0cd60 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Tue, 15 Nov 2022 20:06:11 +0000 Subject: [PATCH 4/6] Addressed some lint notes --- ptulsconv/broadcast_timecode.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ptulsconv/broadcast_timecode.py b/ptulsconv/broadcast_timecode.py index 4c8af71..90f1d8f 100644 --- a/ptulsconv/broadcast_timecode.py +++ b/ptulsconv/broadcast_timecode.py @@ -1,11 +1,21 @@ -from fractions import Fraction -import re +""" +broadcast_timecode.py + +Useful functions for parsing and working with timecode. +""" + import math +import re from collections import namedtuple +from fractions import Fraction from typing import Optional, SupportsFloat -class TimecodeFormat(namedtuple("_TimecodeFormat", "frame_duration logical_fps drop_frame")): +class TimecodeFormat(namedtuple("_TimecodeFormat", "frame_duration logical_fps drop_frame")): + """ + A struct reperesenting a timecode datum. + """ + def smpte_to_seconds(self, smpte: str) -> Optional[Fraction]: frame_count = smpte_to_frame_count(smpte, self.logical_fps, drop_frame_hint=self.drop_frame) if frame_count is None: From bf3a5c37a83e4bdd7b97e3f713982aa6f644b849 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Tue, 15 Nov 2022 20:08:30 +0000 Subject: [PATCH 5/6] Added conftest.py to fix pytest --- conftest.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 conftest.py diff --git a/conftest.py b/conftest.py new file mode 100644 index 0000000..e69de29 From e46ac14118bab35963c8f5df79a796d59c3cb9f1 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Tue, 15 Nov 2022 12:09:58 -0800 Subject: [PATCH 6/6] Update python-package.yml --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 67f4489..1fe9260 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -37,4 +37,4 @@ jobs: flake8 ptulsconv tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest run: | - PYTHONPATH=. pytest + pytest