store project metadata in pyproject.toml (#45)

Author: aradkdj

.github/workflows/release.yml

@@ -31,24 +31,24 @@ jobs:
 
       - name: Set version
         # A specific version was set in the action trigger.
-        # Change the version in setup.cfg to that version
+        # Change the version in pyproject.toml to that version
         if: ${{ github.event.inputs.version != '~~version~~' }}
         run: |
           python .github/workflows/scripts/update_version.py --set-version ${{ github.event.inputs.version }}
 
       - name: Commit version change
-        # If the setup.cfg version was changed commit it.
+        # If the pyproject.toml version was changed, commit it.
         if: ${{ github.event.inputs.version != '~~version~~' }}
         uses: sqlalchemyorg/git-auto-commit-action@sa
         with:
           commit_message: Version ${{ github.event.inputs.version }}
-          file_pattern: setup.cfg
+          file_pattern: pyproject.toml
 
       - name: Get version
         # Get current version
         id: get-version
         run: |
-          version=`grep 'version =' setup.cfg | awk '{print $NF}'`
+          version=`grep 'version =' pyproject.toml | awk '{print $NF}'`
           echo $version
           echo "::set-output name=version::$version"
 
@@ -81,7 +81,7 @@ jobs:
         # Get new current version
         id: get-new-version
         run: |
-          version=`grep 'version =' setup.cfg | awk '{print $NF}'`
+          version=`grep 'version =' pyproject.toml | awk '{print $NF}'`
           echo $version
           echo "::set-output name=version::$version"
 
@@ -90,7 +90,7 @@ jobs:
         uses: sqlalchemyorg/git-auto-commit-action@sa
         with:
           commit_message: Start work on ${{ steps.get-new-version.outputs.version }}
-          file_pattern: setup.cfg
+          file_pattern: pyproject.toml
 
       - name: Publish distribution
         # Publish to pypi

.github/workflows/scripts/update_version.py

@@ -42,30 +42,30 @@ def go(args):
     if args.set_version and not is_canonical(args.set_version):
         raise RuntimeError(f"Cannot use {args.set_version!r} as version")
 
-    setup = pathlib.Path("setup.cfg")
-    setup_text = setup.read_text()
-    new_setup_text = []
+    pyproject = pathlib.Path("pyproject.toml")
+    pyproject_text = pyproject.read_text()
+    new_pyproject_text = []
     found = False
-    for line in setup_text.split("\n"):
+    for line in pyproject_text.split("\n"):
         if not line.startswith("version = "):
-            new_setup_text.append(line)
+            new_pyproject_text.append(line)
             continue
         if found:
             raise RuntimeError(
                 "Multiple lines starting with 'version =' found"
             )
         if args.set_version:
-            new_setup_text.append(f"version = {args.set_version}")
+            new_pyproject_text.append(f'version = "{args.set_version}"')
             version = args.set_version
         else:
-            current_version = line.split(" ")[-1]
+            current_version = line.split(" ")[-1].strip('"')
             version = next_version(current_version)
-            new_setup_text.append(f"version = {version}")
+            new_pyproject_text.append(f'version = "{version}"')
         found = True
     if not found:
         raise RuntimeError("No line found starting with 'version ='")
 
-    setup.write_text("\n".join(new_setup_text))
+    pyproject.write_text("\n".join(new_pyproject_text))
     print("Updated version to", version)
 
 

pyproject.toml

@@ -2,11 +2,56 @@
 build-backend = 'setuptools.build_meta'
 requires = ['setuptools >= 44', 'wheel']
 
+[project]
+name = "zimports"
+version = "0.6.2"
+dependencies = [
+    "pyflakes",
+    "flake8-import-order",
+    "tomli",
+    "importlib-metadata;python_version<'3.10'",
+]
+requires-python = ">= 3.9"
+authors = [
+    {name = "Mike Bayer", email = "mike_mp@zzzcomputing.com"}
+]
+description = "Yet another import fixing tool"
+readme = "README.rst"
+license = "MIT"
+license-files = ["LICENSE"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+
+[project.urls]
+Homepage = "https://github.com/sqlalchemyorg/zimports"
+Issues = "https://github.com/sqlalchemyorg/zimports/issues"
+
+[project.scripts]
+zimports = "zimports:main"
+
 [tool.black]
 line-length = 79
 target-version = ['py39']
 exclude = './test_files'
 
+[tool.pytest.ini_options]
+addopts = "--tb native -v -r sfxX --maxfail=25 -p no:warnings -p no:logging"
+python_files = ["tests.py"]
+
+[tool.setuptools.packages.find]
+include = ["zimports*"]
+
 [tool.zimports]
 black-line-length = 79
 keep-unused-type-checking = true

setup.cfg

@@ -1,53 +1,3 @@
-[metadata]
-name = zimports
-version = 0.6.2
-description = Yet another import fixing tool
-long_description = file: README.rst
-long_description_content_type = text/x-rst
-url = https://github.com/sqlalchemyorg/zimports
-author = Mike Bayer
-author_email = mike_mp@zzzcomputing.com
-license = MIT
-license_files = LICENSE
-classifiers =
-    Development Status :: 4 - Beta
-    Intended Audience :: Developers
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-    Programming Language :: Python :: 3
-    Programming Language : Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
-    Programming Language :: Python :: 3.13
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: Implementation :: PyPy
-project_urls =
-    Issue Tracker=https://github.com/sqlalchemyorg/zimports/issues
-
-[options]
-zip_safe = False
-python_requires = >= 3.7
-packages = find:
-install_requires =
-    pyflakes
-    flake8-import-order
-    tomli
-    importlib-metadata;python_version<"3.10"
-
-[options.entry_points]
-console_scripts =
-    zimports = zimports:main
-
-[options.packages.find]
-include=
-    zimports*
-
-[tool:pytest]
-addopts= --tb native -v -r sfxX --maxfail=25 -p no:warnings -p no:logging
-python_files=tests.py
-
-
 [flake8]
 enable-extensions = G
 # E203 is due to https://github.com/PyCQA/pycodestyle/issues/373