dev

docs/source/conf.py

@@ -15,23 +15,23 @@
 import os
 import re
 import sys
-try:
-    from setuptools.config.setupcfg import read_configuration
-except ModuleNotFoundError:
-    from setuptools.config import read_configuration
+import tomllib
+
 sys.path.insert(0, os.path.abspath('../..'))
 
 def get_project_metadata():
-    path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../setup.cfg"))
-    return read_configuration(path)["metadata"]
+    path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../pyproject.toml"))
+    with open(path, "rb") as f:
+        return tomllib.load(f)['project']
+
 
 
 metadata = get_project_metadata()
 # -- Project information -----------------------------------------------------
 
 project = metadata['name']
-copyright = '2018, {}'.format(metadata['author'])
-author = metadata['author']
+copyright = '2018, {}'.format(metadata['authors'][0]['name'])
+author = metadata['authors'][0]['name']
 
 # The short X.Y version
 version_extractor = re.compile(r"\d+[.]\d+[.]\d+")

pyproject.toml

@@ -7,13 +7,46 @@ requires = [
 ]
 build-backend = "uiucprescon.build"
 
+[project]
+name = "uiucprescon.ocr"
+version = "0.1.5.dev1"
+classifiers = [
+    'Development Status :: 3 - Alpha',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3',
+    'Topic :: Software Development :: Libraries :: Python Modules',
+]
+readme = "README.rst"
+requires-python = ">=3.8"
+license = { file="LICENSE"}
+description = "Image to text processing using Google Tesseract"
+maintainers = [
+    { name="Henry Borchers", email="hborcher@illinois.edu" }
+]
+authors = [
+    {name="University Library at The University of Illinois at Urbana Champaign: Preservation Services", email="prescons@library.illinois.edu"}
+]
+
+[project.urls]
+Documentation = "https://www.library.illinois.edu/dccdocs/ocr"
+Download = "https://github.com/UIUCLibrary/ocr"
+
+[tool.setuptools]
+packages = [
+    "uiucprescon.ocr"
+]
+zip-safe = false
+
+[tool.setuptools.package-data]
+"uiucprescon.ocr" = ["py.typed"]
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 testpaths = [
     "tests"
  ]
 addopts = "--verbose"
-markers =[
+markers = [
     "integration"
 ]
 norecursedirs = [
@@ -25,6 +58,24 @@ junit_log_passing_tests = true
 junit_family="xunit2"
 bdd_features_base_dir = "tests/features/"
 
+[tool.coverage.run]
+relative_files = true
+branch = true
+
+[tool.coverage.paths]
+source = [
+    "uiucprescon/"
+]
+
+[tool.coverage.report]
+exclude_lines = [
+    'raise NotImplementedError'
+]
+
+[tool.coverage.html]
+directory = "reports/coverage"
+
+
 [tool.pylint.MASTER]
 init-hook="sys.path.append('.')"
 

setup.cfg

@@ -1,46 +1,4 @@
-[metadata]
-name = uiucprescon.ocr
-version = 0.1.5.dev1
-url = http://www.library.illinois.edu/dccdocs/ocr
-download_url = https://github.com/UIUCLibrary/ocr
-author = University Library at The University of Illinois at Urbana Champaign: Preservation Services
-author_email = prescons@library.illinois.edu
-description = Image to text processing using Google Tesseract
-long_description = file: README.rst
-long_description_content_type = text/x-rst
-license = University of Illinois/NCSA Open Source License
-license_files = LICENSE
-maintainer = Henry Borchers
-maintainer_email = hborcher@illinois.edu
-classifiers =
-    Development Status :: 3 - Alpha
-    Programming Language :: Python
-    Programming Language :: Python :: 3
-    Topic :: Software Development :: Libraries :: Python Modules
-
-[options]
-python_requires = >= 3.8
-zip_safe = False
-
 [build_sphinx]
 source_dir = docs/source
 build_dir = build/docs
 all_files = 1
-
-[aliases]
-test = pytest
-
-
-[coverage:run]
-relative_files = True
-branch = True
-
-[coverage:report]
-exclude_lines =
-    raise NotImplementedError
-
-[coverage:html]
-directory = reports/coverage
-
-[coverage:paths]
-source = uiucprescon/

setup.py

@@ -177,16 +177,8 @@ def locate(dep, location):
     os.path.abspath(os.path.dirname(__file__))
 
 setuptools.setup(
-    packages=['uiucprescon.ocr'],
-    install_requires=[],
-    test_suite='tests',
-    tests_require=[
-        'pytest',
-        'pytest-bdd'
-    ],
     ext_modules=[
         tesseract_extension
     ],
-    package_data={"uiucprescon.ocr": ["py.typed"]},
     cmdclass=cmd_class,
 )