From fbf55ec2e626c571a98bf086f02541812e16609a Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Fri, 28 Dec 2018 22:51:09 -0800 Subject: [PATCH 1/2] test tweaks added a test and removed superfluous init file --- tests/__init__.py | 0 tests/test_parse.py | 1 + 2 files changed, 1 insertion(+) delete mode 100644 tests/__init__.py diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/test_parse.py b/tests/test_parse.py index 734110e..f2b7a05 100644 --- a/tests/test_parse.py +++ b/tests/test_parse.py @@ -28,6 +28,7 @@ class TestParse(TestCase): with open(f"tests/edls/{fn}" ,'r') as f: edl = pycmx.parse_cmx3600(f) self.assertTrue( type(edl.title) is str ) + self.assertTrue( len(edl.title) > 0 ) def test_event_sanity(self): From 16e8754a7b4d359ff67717833ce0e2e9a2ac8b31 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Fri, 28 Dec 2018 23:08:22 -0800 Subject: [PATCH 2/2] Merge branch master into release --- pycmx/__init__.py | 2 +- pycmx/channel_map.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pycmx/__init__.py b/pycmx/__init__.py index 47ecb03..7e72d3a 100644 --- a/pycmx/__init__.py +++ b/pycmx/__init__.py @@ -8,7 +8,7 @@ copy and reuse this software, refer to the LICENSE file included with the distribution. """ -__version__ = '0.7' +__version__ = '0.8' __author__ = 'Jamie Hardt' from .parse_cmx_events import parse_cmx3600, Transition, Event, Edit diff --git a/pycmx/channel_map.py b/pycmx/channel_map.py index 39e6295..b94bc81 100644 --- a/pycmx/channel_map.py +++ b/pycmx/channel_map.py @@ -92,7 +92,7 @@ class ChannelMap: if matchresult: self.set_audio_channel(int( matchresult.group(1)), True ) - def _append_sxt(self, audio_ext): + def _append_ext(self, audio_ext): self.a3 = ext.audio3 self.a4 = ext.audio4 diff --git a/setup.py b/setup.py index 3716738..8449519 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ with open("README.md", "r") as fh: long_description = fh.read() setup(name='pycmx', - version='0.7', + version='0.8', author='Jamie Hardt', author_email='jamiehardt@me.com', description='CMX 3600 Edit Decision List Parser',