Changed a format string in the tests so 3.5 should build

This commit is contained in:
Jamie Hardt
2019-01-03 19:28:48 -08:00
parent 68f118ab6b
commit 7b4a76448e
5 changed files with 34 additions and 4 deletions

View File

@@ -1,6 +1,7 @@
language: python language: python
python: python:
- "3.6" - "3.6"
- "3.5"
script: script:
- "python3 setup.py test" - "python3 setup.py test"
install: install:

View File

@@ -96,3 +96,11 @@ class ChannelMap:
self.a3 = ext.audio3 self.a3 = ext.audio3
self.a4 = ext.audio4 self.a4 = ext.audio4
def __or__(self, other):
"""
Return the logical union of this channel map with another
"""
out_v = self.video | other.video
out_a = self._audio_channel_set | other._audio_channel_set
return ChannelMap(v=out_v,audio_channels = out_a)

View File

@@ -3,6 +3,7 @@
from .parse_cmx_statements import (StmtUnrecognized, StmtFCM, StmtEvent, StmtSourceUMID) from .parse_cmx_statements import (StmtUnrecognized, StmtFCM, StmtEvent, StmtSourceUMID)
from .event import Event from .event import Event
from .channel_map import ChannelMap
class EditList: class EditList:
""" """
@@ -35,6 +36,20 @@ class EditList:
return 'unknown' return 'unknown'
@property
def channels(self):
"""
Return the union of every channel channel.
"""
retval = ChannelMap()
for event in self.events:
for edit in event.edits:
retval = retval | edit.channels
return retval
@property @property
def title(self): def title(self):
""" """

View File

@@ -17,6 +17,7 @@ setup(name='pycmx',
'Topic :: Multimedia :: Video', 'Topic :: Multimedia :: Video',
'Topic :: Text Processing', 'Topic :: Text Processing',
'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.6' 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6'
], ],
packages=['pycmx']) packages=['pycmx'])

View File

@@ -21,7 +21,8 @@ class TestParse(TestCase):
with open(f"tests/edls/{fn}" ,'r') as f: with open(f"tests/edls/{fn}" ,'r') as f:
edl = pycmx.parse_cmx3600(f) edl = pycmx.parse_cmx3600(f)
actual = len( list( edl.events )) actual = len( list( edl.events ))
self.assertTrue( actual == count , f"expected {count} in file {fn} but found {actual}") self.assertTrue( actual == count ,
"expected %i in file %s but found %i" % (count, fn, actual))
def test_list_sanity(self): def test_list_sanity(self):
for fn in type(self).files: for fn in type(self).files:
@@ -104,3 +105,7 @@ class TestParse(TestCase):
edl = pycmx.parse_cmx3600(f) edl = pycmx.parse_cmx3600(f)
events = list(edl.events) events = list(edl.events)
self.assertEqual( events[4].edits[1].transition.name , "CROSS DISSOLVE" ) self.assertEqual( events[4].edits[1].transition.name , "CROSS DISSOLVE" )
# add test for edit_list.channels