diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7fcbaf0..12328e2 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 - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + pip install -e . - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index c2835db..4b083ea 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -16,7 +16,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install setuptools wheel twine + pip install build twine - name: Install parsimonious run: | pip install parsimonious @@ -25,7 +25,7 @@ jobs: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_API_KEY }} run: | - python setup.py sdist bdist_wheel + python -m build twine upload dist/* - name: Report to Mastodon uses: cbrgm/mastodon-github-action@v1.0.1 diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index 95892a1..4a1fecd 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -1,4 +1,4 @@ __version__ = '1.0.5' -__author__ = 'Jamie Hardt' -__license__ = 'MIT' -__copyright__ = "%s %s (c) 2022 %s. All rights reserved." % (__name__, __version__, __author__) +# __author__ = 'Jamie Hardt' +# __license__ = 'MIT' +# __copyright__ = "%s %s (c) 2022 %s. All rights reserved." % (__name__, __version__, __author__) diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..f00e42c --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,43 @@ +[build-system] +requires = ["flit_core >=3.2,<4"] +build-backend = "flit_core.buildapi" + +[project] +name = "ptulsconv" +authors = [ + {name = "Jamie Hardt", email = "jamiehardt@me.com"}, +] +readme = "README.md" +license = { file = "LICENSE" } +classifiers = [ + 'License :: OSI Approved :: MIT License', + 'Topic :: Multimedia', + 'Topic :: Multimedia :: Sound/Audio', + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Development Status :: 5 - Production/Stable", + "Topic :: Text Processing :: Filters" +] +requires-python = ">=3.7" +dynamic = ["version", "description"] +keywords = ["text-processing", "parsers", "film", + "broadcast", "editing", "editorial"] +dependencies = ['parsimonious', 'tqdm', 'reportlab'] + +[project.optional-dependencies] +doc = [ + "Sphinx ~= 5.3.0", + "sphinx-rtd-theme >= 1.1.1" +] + +[project.scripts] +flit = "ptulsconv.__main__:main" + + +[project.urls] +Source = 'https://github.com/iluvcapra/ptulsconv' +Issues = 'https://github.com/iluvcapra/ptulsconv/issues' +Documentation = 'https://ptulsconv.readthedocs.io/' \ No newline at end of file diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index ac5e14c..0000000 --- a/requirements.txt +++ /dev/null @@ -1,13 +0,0 @@ -attrs==22.1.0 -exceptiongroup==1.0.4 -iniconfig==1.1.1 -packaging==21.3 -parsimonious==0.10.0 -Pillow==9.3.0 -pluggy==1.0.0 -pyparsing==3.0.9 -pytest==7.2.0 -regex==2022.10.31 -reportlab==3.6.12 -tomli==2.0.1 -tqdm==4.64.1 diff --git a/setup.py b/setup.py deleted file mode 100644 index e2a0722..0000000 --- a/setup.py +++ /dev/null @@ -1,44 +0,0 @@ -from setuptools import setup - -from ptulsconv import __author__, __license__, __version__ - -with open("README.md", "r") as fh: - long_description = fh.read() - -setup(name='ptulsconv', - version=__version__, - author=__author__, - description='Parse and convert Pro Tools text exports', - long_description_content_type="text/markdown", - long_description=long_description, - license=__license__, - url='https://github.com/iluvcapra/ptulsconv', - project_urls={ - 'Source': - 'https://github.com/iluvcapra/ptulsconv', - 'Issues': - 'https://github.com/iluvcapra/ptulsconv/issues', - }, - classifiers=[ - 'License :: OSI Approved :: MIT License', - 'Topic :: Multimedia', - 'Topic :: Multimedia :: Sound/Audio', - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Development Status :: 5 - Production/Stable", - "Topic :: Text Processing :: Filters"], - packages=['ptulsconv'], - keywords='text-processing parsers film tv editing editorial', - install_requires=['parsimonious', 'tqdm', 'reportlab'], - package_data={ - "ptulsconv": ["xslt/*.xsl"] - }, - entry_points={ - 'console_scripts': [ - 'ptulsconv = ptulsconv.__main__:main' - ] - } - )