Update metadata.py

Switched to pypi token authentication

.coveragerc

@@ -1,13 +0,0 @@
-[run]
-branch = True
-source = wavinfo 
-
-[report]
-exclude_lines =
-    if self.debug:
-    pragma: no cover
-    raise NotImplementedError
-    if __name__ == .__main__.:
-ignore_errors = True
-omit =
-    tests/*

.github/workflows/python-package.yml

@@ -0,0 +1,42 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Python Lint and Test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v2.5.0
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4.3.0
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Setup FFmpeg
+      uses: FedericoCarboni/setup-ffmpeg@v2
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

.github/workflows/pythonpublish.yml

@@ -19,7 +19,7 @@ jobs:
         pip install setuptools wheel twine lxml
     - name: Build and publish
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
         python setup.py sdist bdist_wheel

.idea/.gitignore

@@ -1,3 +0,0 @@
-
-# Default ignored files
-/workspace.xml

.idea/dictionaries/jamiehardt.xml

@@ -1,9 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="jamiehardt">
-    <words>
-      <w>bext</w>
-      <w>ident</w>
-      <w>umid</w>
-    </words>
-  </dictionary>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (wavinfo)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (wavinfo)" project-jdk-type="Python SDK" />
+  <component name="PyPackaging">
+    <option name="earlyReleasesAsUpgrades" value="true" />
+  </component>
 </project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/wavinfo.iml" filepath="$PROJECT_DIR$/.idea/wavinfo.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/wavinfo.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.7 (wavinfo)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

.idea/workspace.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="fb29ad56-fffe-478f-9c0e-1718aa04342e" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/dictionaries/jamiehardt.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dictionaries/jamiehardt.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/wavinfo.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/wavinfo.iml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="wavinfo" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
+  </component>
+  <component name="ProjectId" id="1VtfP9ukGK4GNIXS2m0hRLG9d7w" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showMembers" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="TODO_SCOPE" value="Project Files" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="project-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="fb29ad56-fffe-478f-9c0e-1718aa04342e" name="Default Changelist" comment="" />
+      <created>1578077284420</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1578077284420</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="655" y="287" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1598547965709">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="655" y="287" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598547965709" />
+    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1598555737671">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598555737671" />
+    <state x="476" y="183" key="SettingsEditor" timestamp="1598548365517">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="476" y="183" key="SettingsEditor/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598548365517" />
+    <state x="114" y="123" width="1706" height="842" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1597689482054">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="114" y="123" width="1706" height="842" key="com.intellij.history.integration.ui.views.FileHistoryDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1597689482054" />
+    <state x="577" y="376" key="com.intellij.ide.util.TipDialog" timestamp="1601767353495">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="577" y="376" key="com.intellij.ide.util.TipDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598550975228" />
+    <state x="577" y="376" key="com.intellij.ide.util.TipDialog/1920.0.1920.1080/0.0.1920.1080@0.0.1920.1080" timestamp="1601767353495" />
+    <state x="772" y="468" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1598547948993">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="772" y="468" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598547948993" />
+    <state x="632" y="254" width="670" height="676" key="search.everywhere.popup" timestamp="1598554315633">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="632" y="254" width="670" height="676" key="search.everywhere.popup/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598554315633" />
+  </component>
+</project>

.travis.yml

@@ -1,27 +0,0 @@
-dist: xenial
-language: python
-python:
-#    - "2.7"
-#    - "3.5"
-    - "3.6"
-    - "3.7"
-    - "3.8"
-    - "3.9"
-script:
-    - "gunzip tests/test_files/rf64/*.gz"
-    - "python setup.py test"
-    - "python -m pytest tests/ -v --cov wavinfo --cov-report term-missing"
-before_install:
-    - "sudo apt-get update"
-    - "sudo add-apt-repository universe"
-    - "sudo apt-get install -y ffmpeg"
-    - "pip install pytest"
-    - "pip install lxml"
-    - "pip install coverage"
-    - "pip install codecov"
-    - "pip install pytest-cov==2.5.0"
-    - "pip install coverage==4.4"
-install:
-    - "pip install setuptools"
-after_success:
-    - "codecov"

README.md

@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.com/iluvcapra/wavinfo.svg?branch=master)](https://travis-ci.com/iluvcapra/wavinfo)
-[![codecov](https://codecov.io/gh/iluvcapra/wavinfo/branch/master/graph/badge.svg)](https://codecov.io/gh/iluvcapra/wavinfo)
 [![Documentation Status](https://readthedocs.org/projects/wavinfo/badge/?version=latest)](https://wavinfo.readthedocs.io/en/latest/?badge=latest) ![](https://img.shields.io/github/license/iluvcapra/wavinfo.svg) ![](https://img.shields.io/pypi/pyversions/wavinfo.svg) [![](https://img.shields.io/pypi/v/wavinfo.svg)](https://pypi.org/project/wavinfo/) ![](https://img.shields.io/pypi/wheel/wavinfo.svg)
+![Lint and Test](https://github.com/iluvcapra/wavinfo/actions/workflows/python-package.yml/badge.svg)
 
 <!-- ![Test](https://github.com/iluvcapra/wavinfo/workflows/Upload%20Python%20Package/badge.svg) -->
 
@@ -60,10 +59,6 @@ The length of the file in frames (interleaved samples) and bytes is available, a
 >>> (48000, 2, 6, 24)
 ```
 
-## Platform Lifecycle Stuff
-
-Python 3.5 support is deprecated.
-
 ## Other Resources
 
 * For other file formats and ID3 decoding, look at [audio-metadata](https://github.com/thebigmunch/audio-metadata).

metadata.py

@@ -0,0 +1,6 @@
+"""
+Wavinfo
+"""
+__version__ = '1.7.0'
+__author__ = 'Jamie Hardt <jamiehardt@gmail.com>'
+__license__ = "MIT"

requirements.txt

@@ -1,3 +1,19 @@
-lxml~=4.5.2
-setuptools~=49.6.0
-ear~=2.0.0
+attrs==21.4.0
+ear==2.1.0
+enum34==1.1.10
+exceptiongroup==1.0.4
+iniconfig==1.1.1
+lxml==4.9.1
+multipledispatch==0.6.0
+numpy==1.23.3
+packaging==21.3
+pluggy==1.0.0
+pyparsing==3.0.9
+pytest==7.2.0
+ruamel.yaml==0.17.21
+ruamel.yaml.clib==0.2.6
+scipy==1.9.1
+six==1.16.0
+style==1.1.0
+tomli==2.0.1
+update==0.0.1

setup.py

@@ -1,5 +1,5 @@
 from setuptools import setup
-from wavinfo import __author__, __license__, __version__
+from metadata import __author__, __license__, __version__
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
@@ -26,11 +26,9 @@ setup(name='wavinfo',
           'License :: OSI Approved :: MIT License',
           'Topic :: Multimedia',
           'Topic :: Multimedia :: Sound/Audio',
-#           "Programming Language :: Python :: 3.5",
-          "Programming Language :: Python :: 3.6",
-          "Programming Language :: Python :: 3.7",
           "Programming Language :: Python :: 3.8",
-          "Programming Language :: Python :: 3.9"],
+          "Programming Language :: Python :: 3.9",
+          "Programming Language :: Python :: 3.10"],
       keywords='waveform metadata audio ebu smpte avi library film tv editing editorial',
       install_requires=['lxml', 'ear'],
       entry_points={

tests/test_wave_parsing.py

@@ -12,7 +12,7 @@ class TestWaveInfo(TestCase):
     def test_sanity(self):
         for wav_file in all_files():
             info = wavinfo.WavInfoReader(wav_file)
-            self.assertEqual(info.__repr__(), 'WavInfoReader(%s, %s, %s)'.format(wav_file, 'latin_1', 'ascii'))
+            self.assertEqual(info.__repr__(), 'WavInfoReader({}, latin_1, ascii)'.format(os.path.abspath(wav_file)))
             self.assertIsNotNone(info)
 
     def test_fmt_against_ffprobe(self):

wavinfo/__init__.py

@@ -7,6 +7,3 @@ Go to the documentation for wavinfo.WavInfoReader for more information.
 from .wave_reader import WavInfoReader
 from .riff_parser import WavInfoEOFError
 
-__version__ = '1.6'
-__author__ = 'Jamie Hardt <jamiehardt@gmail.com>'
-__license__ = "MIT"

wavinfo/wave_reader.py

@@ -27,43 +27,57 @@ class WavInfoReader:
         """
         Create a new reader object.
 
-        :param path: A filesystem path to the wav file you wish to probe.
+        :param path: 
+            A filesystem path to the wav file you wish to probe or a 
+            file handle to an open file.
 
-        :param info_encoding: The text encoding of the INFO metadata fields.
-          latin_1/Win CP1252 has always been a pretty good guess for this.
+        :param info_encoding: 
+            The text encoding of the INFO metadata fields.
+            latin_1/Win CP1252 has always been a pretty good guess for this.
 
-        :param bext_encoding: The text encoding to use when decoding the string
-          fields of the Broadcast-WAV extension. Per EBU 3285 this is ASCII
-          but this parameter is available to you if you encounter a weirdo.
+        :param bext_encoding: 
+            The text encoding to use when decoding the string
+            fields of the Broadcast-WAV extension. Per EBU 3285 this is ASCII
+            but this parameter is available to you if you encounter a weirdo.
         """
-        absolute_path = os.path.abspath(path)
-
-        #: `file://` url for the file.
-        self.url = pathlib.Path(absolute_path).as_uri()
-
-        # for __repr__()
-        self.path = absolute_path
+        
         self.info_encoding = info_encoding
         self.bext_encoding = bext_encoding
+        
+        if hasattr(path, 'read'):
+            self.get_wav_info(path)
+            self.url = 'about:blank'
+            self.path = repr(path)
+        else:
+            absolute_path = os.path.abspath(path)
 
-        with open(path, 'rb') as f:
-            chunks = parse_chunk(f)
+            #: `file://` url for the file.
+            self.url = pathlib.Path(absolute_path).as_uri()
 
-            self.main_list = chunks.children
-            f.seek(0)
+            # for __repr__()
+            self.path = absolute_path
+            
+            with open(path, 'rb') as f:
+                self.get_wav_info(f)
+            
+    def get_wav_info(self, wavfile):
+        chunks = parse_chunk(wavfile)
 
-            #: :class:`wavinfo.wave_reader.WavAudioFormat`
-            self.fmt = self._get_format(f)
+        self.main_list = chunks.children
+        wavfile.seek(0)
 
-            #: :class:`wavinfo.wave_bext_reader.WavBextReader` with Broadcast-WAV metadata
-            self.bext = self._get_bext(f, encoding=bext_encoding)
+        #: :class:`wavinfo.wave_reader.WavAudioFormat`
+        self.fmt = self._get_format(wavfile)
 
-            #: :class:`wavinfo.wave_ixml_reader.WavIXMLFormat` with iXML metadata
-            self.ixml = self._get_ixml(f)
+        #: :class:`wavinfo.wave_bext_reader.WavBextReader` with Broadcast-WAV metadata
+        self.bext = self._get_bext(wavfile, encoding=self.bext_encoding)
 
-            #: :class:`wavinfo.wave_info_reader.WavInfoChunkReader` with RIFF INFO metadata
-            self.info = self._get_info(f, encoding=info_encoding)
-            self.data = self._describe_data()
+        #: :class:`wavinfo.wave_ixml_reader.WavIXMLFormat` with iXML metadata
+        self.ixml = self._get_ixml(wavfile)
+
+        #: :class:`wavinfo.wave_info_reader.WavInfoChunkReader` with RIFF INFO metadata
+        self.info = self._get_info(wavfile, encoding=self.info_encoding)
+        self.data = self._describe_data()
 
     def _find_chunk_data(self, ident, from_stream, default_none=False):
         top_chunks = (chunk for chunk in self.main_list if type(chunk) is ChunkDescriptor and chunk.ident == ident)
@@ -146,4 +160,4 @@ class WavInfoReader:
                     yield 'info', key, info_dict[key]
 
     def __repr__(self):
-        return 'WavInfoReader(%s, %s, %s)'.format(self.path, self.info_encoding, self.bext_encoding)
+        return 'WavInfoReader({}, {}, {})'.format(self.path, self.info_encoding, self.bext_encoding)