From 630e7960dc0ca0bf99a6254a0e73e716e1a94c37 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sat, 24 May 2025 22:20:15 -0700 Subject: [PATCH 1/9] Making changes for peotry --- ptulsconv/__init__.py | 5 ---- pyproject.toml | 62 +++++++++++++------------------------------ 2 files changed, 19 insertions(+), 48 deletions(-) diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index 72a7e32..9d17323 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -2,8 +2,3 @@ Parse and convert Pro Tools text exports """ -__version__ = '2.2.1' -__author__ = 'Jamie Hardt' -__license__ = 'MIT' -__copyright__ = "%s %s (c) 2025 %s. All rights reserved." \ - % (__name__, __version__, __author__) diff --git a/pyproject.toml b/pyproject.toml index 9975713..2f2809e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,53 +1,29 @@ -[build-system] -requires = ["flit_core >=3.2,<4"] -build-backend = "flit_core.buildapi" - -[project] +[tool.poetry] name = "ptulsconv" -authors = [ - {name = "Jamie Hardt", email = "jamiehardt@me.com"}, -] +version = "2.2.2" +description = "Read Pro Tools Text exports and generate PDF ADR Reports, JSON" +authors = ["Jamie Hardt "] +license = "MIT" readme = "README.md" -license = { file = "LICENSE" } -classifiers = [ - 'License :: OSI Approved :: MIT License', - 'Topic :: Multimedia', - 'Topic :: Multimedia :: Sound/Audio', - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Development Status :: 5 - Production/Stable", - "Topic :: Text Processing :: Filters" -] -requires-python = ">=3.8" -dynamic = ["version", "description"] -keywords = ["text-processing", "parsers", "film", - "broadcast", "editing", "editorial"] -dependencies = [ - 'parsimonious', - 'tqdm', - 'reportlab', - 'py-ptsl >= 101.1.0' - ] -[project.optional-dependencies] -doc = [ - "Sphinx ~= 5.3.0", - "sphinx-rtd-theme >= 1.1.1" -] +[tool.poetry.dependencies] +python = "^3.8" +parsimonious = "^0.10.0" +tqdm = "^4.67.1" +reportlab = "^4.4.1" +py-ptsl = "^101.1.0" -[tool.flit.module] -name = "ptulsconv" +[tool.poetry.extras] +doc = ['sphinx', 'sphinx_rtd_theme'] -[project.scripts] -ptulsconv = "ptulsconv.__main__:main" - -[project.entry_points.console_scripts] -ptulsconv = 'ptulsconv.__main__:main' +[tool.poetry.scripts] +wavinfo = 'ptulsconv.__main__:main' [project.urls] Source = 'https://github.com/iluvcapra/ptulsconv' Issues = 'https://github.com/iluvcapra/ptulsconv/issues' Documentation = 'https://ptulsconv.readthedocs.io/' + +[build-system] +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" From 8b262d3bfbd5015d9611bc4b20d423031150f8e7 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sat, 24 May 2025 22:22:04 -0700 Subject: [PATCH 2/9] Rearranged pyproject, brought in metadata --- pyproject.toml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 2f2809e..f8e3b39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,22 @@ +[project] +name = "ptulsconv" +license = { file = "LICENSE" } +classifiers = [ + 'License :: OSI Approved :: MIT License', + 'Topic :: Multimedia', + 'Topic :: Multimedia :: Sound/Audio', + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Development Status :: 5 - Production/Stable", + "Topic :: Text Processing :: Filters" +] +requires-python = ">=3.8" +keywords = ["text-processing", "parsers", "film", + "broadcast", "editing", "editorial"] + [tool.poetry] name = "ptulsconv" version = "2.2.2" @@ -19,6 +38,7 @@ doc = ['sphinx', 'sphinx_rtd_theme'] [tool.poetry.scripts] wavinfo = 'ptulsconv.__main__:main' + [project.urls] Source = 'https://github.com/iluvcapra/ptulsconv' Issues = 'https://github.com/iluvcapra/ptulsconv/issues' From 1e6546dab58d48b3eeaaae4195be7026b8f74025 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sat, 24 May 2025 22:24:45 -0700 Subject: [PATCH 3/9] Tweak file for flake --- ptulsconv/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index 9d17323..e692153 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -1,4 +1,3 @@ """ Parse and convert Pro Tools text exports """ - From 5aa005c3177487625a6ce19f0d1c63e1092af43c Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 25 May 2025 07:00:44 -0700 Subject: [PATCH 4/9] Update conf.py --- docs/source/conf.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 8ddc70e..7727819 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -3,6 +3,7 @@ # For the full list of built-in configuration values, see the documentation: # https://www.sphinx-doc.org/en/master/usage/configuration.html +import importlib import sys import os @@ -15,9 +16,9 @@ import ptulsconv # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information project = 'ptulsconv' -copyright = '2019-2023 Jamie Hardt. All rights reserved' +copyright = ptulsconv.__oopyright__ # author = ptulsconv.__author__ -release = ptulsconv.__version__ +release = importlib.metadata.version("ptulsconv") # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration From 484a70fc8eafc6f1b876664c17e5b251aaf95d4a Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 25 May 2025 07:01:47 -0700 Subject: [PATCH 5/9] Update __init__.py --- ptulsconv/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index e692153..0304464 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -1,3 +1,5 @@ """ Parse and convert Pro Tools text exports """ + +__copyright__ = "(c) 2019-2025 Jamie Hardt. All rights reserved." From 9684be6c7e29d2e973b49cec582d674a74d64507 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 25 May 2025 07:03:28 -0700 Subject: [PATCH 6/9] Update __init__.py --- ptulsconv/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index 0304464..e692153 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -1,5 +1,3 @@ """ Parse and convert Pro Tools text exports """ - -__copyright__ = "(c) 2019-2025 Jamie Hardt. All rights reserved." From 779c93282ce50801c0f86c200b74c02a5c3ab5f6 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 25 May 2025 07:04:17 -0700 Subject: [PATCH 7/9] Update conf.py Updated copyright message --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 7727819..59bc9fc 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -16,7 +16,7 @@ import ptulsconv # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information project = 'ptulsconv' -copyright = ptulsconv.__oopyright__ +copyright = '2019-2025 Jamie Hardt. All rights reserved' # author = ptulsconv.__author__ release = importlib.metadata.version("ptulsconv") From 57764bc8599a5f78ef4351c30c44965489978ff2 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 25 May 2025 07:05:24 -0700 Subject: [PATCH 8/9] Update conf.py --- docs/source/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 59bc9fc..309ed36 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -16,8 +16,8 @@ import ptulsconv # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information project = 'ptulsconv' -copyright = '2019-2025 Jamie Hardt. All rights reserved' -# author = ptulsconv.__author__ +copyright = '2019-2025 Jamie Hardt. All rights reserved.' +version = "Version 2" release = importlib.metadata.version("ptulsconv") # -- General configuration --------------------------------------------------- From 921b0f07af91d1c883b36eaa661cc5af5531a10b Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 25 May 2025 07:13:11 -0700 Subject: [PATCH 9/9] Update pyproject.toml Fixing sphinx dependencies --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index f8e3b39..fb39b27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,8 @@ parsimonious = "^0.10.0" tqdm = "^4.67.1" reportlab = "^4.4.1" py-ptsl = "^101.1.0" +sphinx_rtd_theme = {version= '>= 1.1.1', optional=true} +sphinx = {version= '>= 5.3.0', optional=true} [tool.poetry.extras] doc = ['sphinx', 'sphinx_rtd_theme']