From d20d9d1bddd9f37ba0e16dedb7655c3b3c959a85 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Mon, 21 Nov 2022 20:29:33 -0800 Subject: [PATCH 01/10] Update pythonpublish.yml --- .github/workflows/pythonpublish.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index 228376f..5760aa0 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -24,3 +24,13 @@ jobs: run: | python setup.py sdist bdist_wheel twine upload dist/* + - name: Report to Mastodon + uses: cbrgm/mastodon-github-action@v1.0.1 + with: + message: | + I just released a new version of pycmx, my library for reading CMX EDLs! + #sounddesign #filmmaking #python + ${{ github.server_url }}/${{ github.repository }} + env: + MASTODON_URL: ${{ secrets.MASTODON_URL }} + MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }} From 173493a6104901f46cb211a9104e05fd6deee1a2 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:12:42 -0700 Subject: [PATCH 02/10] Updated project to pyproject-style package --- pycmx/__init__.py | 5 ++-- pyproject.toml | 60 +++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 33 -------------------------- 3 files changed, 62 insertions(+), 36 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/pycmx/__init__.py b/pycmx/__init__.py index 387b58d..4a20f1c 100644 --- a/pycmx/__init__.py +++ b/pycmx/__init__.py @@ -3,13 +3,12 @@ pycmx is a module for parsing CMX 3600-style EDLs. For more information and examples see README.md -This module (c) 2018 Jamie Hardt. For more information on your rights to +This module (c) 2022 Jamie Hardt. For more information on your rights to copy and reuse this software, refer to the LICENSE file included with the distribution. """ -__version__ = '1.1.1' -__author__ = 'Jamie Hardt' +__version__ = '1.2.0' from .parse_cmx_events import parse_cmx3600 from .transition import Transition diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..2d1d790 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,60 @@ +[build-system] +requires = ["flit_core >=3.2,<4"] +build-backend = "flit_core.buildapi" + +[project] +name = "pycmx" +authors = [{name = "Jamie Hardt", email = "jamiehardt@me.com"}] +readme = "README.md" +dynamic = ["version", "description"] +requires-python = "~=3.8" +classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'License :: OSI Approved :: MIT License', + 'Topic :: Multimedia', + 'Topic :: Multimedia :: Video', + 'Topic :: Text Processing', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10' +] +dependencies = [ + +] +keywords = [ + 'parser', + 'film', + 'broadcast' +] + +[tool.flit.module] +name = "pycmx" + +[project.optional-dependencies] +doc = [ + 'sphinx >= 5.3.0', + 'sphinx_rtd_theme >= 1.1.1', +] + +[project.urls] +Home = "https://github.com/iluvcapra/pycmx" +Documentation = "https://pycmx.readthedocs.io/" +Source = "https://github.com/iluvcapra/pycmx.git" +Issues = "https://github.com/iluvcapra/pycmx/issues" + +[tool.pyright] +typeCheckingMode = "basic" + +[tool.pylint] +max-line-length = 88 +disable = [ + "C0103", # (invalid-name) + "C0114", # (missing-module-docstring) + "C0115", # (missing-class-docstring) + "C0116", # (missing-function-docstring) + "R0903", # (too-few-public-methods) + "R0913", # (too-many-arguments) + "W0105", # (pointless-string-statement) +] diff --git a/setup.py b/setup.py deleted file mode 100644 index eb00fe8..0000000 --- a/setup.py +++ /dev/null @@ -1,33 +0,0 @@ -from setuptools import setup - -with open("README.md", "r") as fh: - long_description = fh.read() - -setup(name='pycmx', - version='1.1.5', - author='Jamie Hardt', - author_email='jamiehardt@me.com', - description='CMX 3600 Edit Decision List Parser', - long_description_content_type="text/markdown", - long_description=long_description, - project_urls={ - 'Source': - 'https://github.com/iluvcapra/pycmx', - 'Documentation': - 'https://pycmx.readthedocs.io/', - 'Issues': - 'https://github.com/iluvcapra/pycmx/issues', - }, - url='https://github.com/iluvcapra/pycmx', - classifiers=['Development Status :: 5 - Production/Stable', - 'License :: OSI Approved :: MIT License', - 'Topic :: Multimedia', - 'Topic :: Multimedia :: Video', - 'Topic :: Text Processing', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10' - ], - packages=['pycmx']) From 7123a6f1bb4e941211f29533849acc76cf31070c Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:13:29 -0700 Subject: [PATCH 03/10] Deleted requirements.txt --- requirements.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9d159f2..0000000 --- a/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -attrs==22.1.0 -coverage==6.5.0 -exceptiongroup==1.0.4 -iniconfig==1.1.1 -packaging==21.3 -pluggy==1.0.0 -pyparsing==3.0.9 -pytest==7.2.0 -tomli==2.0.1 From 0b5555d333a4bf52449b770607f82f7820fa8252 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:15:02 -0700 Subject: [PATCH 04/10] Updated workflow for pyproject installation --- .github/workflows/python-package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index cf33297..c005312 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -28,7 +28,8 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install flake8 pytest - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + python3 -m ppi install -e . + # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From f855d3581d4c6b1a42d29c62cc11bf0f57f8d4ec Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:16:35 -0700 Subject: [PATCH 05/10] Update python-package.yml Fixed typo --- .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 c005312..5343a98 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -28,7 +28,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install flake8 pytest - python3 -m ppi install -e . + python3 -m pip install -e . # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Lint with flake8 run: | From 62e7f10cf4e9517177cc5bf2addb577124fd475b Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:19:02 -0700 Subject: [PATCH 06/10] Update pyproject.toml Downgraded minimum python version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2d1d790..97c39da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "pycmx" authors = [{name = "Jamie Hardt", email = "jamiehardt@me.com"}] readme = "README.md" dynamic = ["version", "description"] -requires-python = "~=3.8" +requires-python = "~=3.6" classifiers = [ 'Development Status :: 5 - Production/Stable', 'License :: OSI Approved :: MIT License', From b3b6e57f6cff5b80bd3fe979f31481532db6f967 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:20:32 -0700 Subject: [PATCH 07/10] Update pyproject.toml Adding 3.11 to versions --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 97c39da..2503620 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,8 @@ classifiers = [ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10' + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11' ] dependencies = [ From 41fdeeaf5626e621cf5165f59570fb30237e4de0 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:21:06 -0700 Subject: [PATCH 08/10] Update python-package.yml Adding 3.11 to test grid --- .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 5343a98..35d58e0 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 From 9838e6b357aa867442bc78071106cd11447b594f Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:22:50 -0700 Subject: [PATCH 09/10] Update python-package.yml Adding py3.6 to test grid --- .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 35d58e0..db85354 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 From 3a9d81417ec92678e982d2c34b09504ccf6fa9b3 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 May 2023 16:24:36 -0700 Subject: [PATCH 10/10] Removing 3.6 from test grid and project classifiers 3.6 isn't supported by the github actions anymore. --- .github/workflows/python-package.yml | 2 +- pyproject.toml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index db85354..35d58e0 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 diff --git a/pyproject.toml b/pyproject.toml index 2503620..a66e9d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,14 +7,13 @@ name = "pycmx" authors = [{name = "Jamie Hardt", email = "jamiehardt@me.com"}] readme = "README.md" dynamic = ["version", "description"] -requires-python = "~=3.6" +requires-python = "~=3.7" classifiers = [ 'Development Status :: 5 - Production/Stable', 'License :: OSI Approved :: MIT License', 'Topic :: Multimedia', 'Topic :: Multimedia :: Video', 'Topic :: Text Processing', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9',