add pyproject.toml and setup.cfg, remove setup.py

craigahobbs · Oct 31, 2022 · 781a982 · 781a982
1 parent 6891ab9
commit 781a982
Show file tree

Hide file tree

Showing 22 changed files with 200 additions and 300 deletions.
diff --git a/template/doc/conf.py b/template/doc/conf.py
@@ -24,8 +24,8 @@
 # The full version, including alpha/beta/rc tags
 import os
 import re
-with open(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', 'setup.py'), encoding='utf-8') as init_file:
-    release = re.search(r"version='(.+?)'", init_file.read()).group(1)
+with open(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', 'setup.cfg'), encoding='utf-8') as init_file:
+    release = re.search(r"version\s*=\s*(\S+)", init_file.read()).group(1)
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/template/pyproject.toml b/template/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel"]
diff --git a/template/setup.cfg b/template/setup.cfg
@@ -0,0 +1,36 @@
+[metadata]
+name = {{package}}
+version = 0.9.0
+url = https://github.com/{{github}}/{{package}}
+author = {{name}}
+author_email = {{email}}
+license = MIT
+description = {{package}}
+{% if noapi is defined and noapi -%}
+long_description = file:README.md
+long_description_content_type = text/markdown; charset=UTF-8
+{% else -%}
+long_description = file:README.rst
+{% endif -%}
+keywords = {{package}}
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    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
+    Topic :: Utilities
+
+[options]
+packages = {{package | replace("-", "_")}}
+package_dir =
+    = src
+{% if nomain is not defined or not nomain %}
+[options.entry_points]
+console_scripts =
+    {{package}} = {{package | replace("-", "_")}}.main:main
+{% endif -%}
diff --git a/template/setup.py b/template/setup.py
diff --git a/test-expected/noapi-0-nomain-0/doc/conf.py b/test-expected/noapi-0-nomain-0/doc/conf.py
@@ -24,8 +24,8 @@
 # The full version, including alpha/beta/rc tags
 import os
 import re
-with open(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', 'setup.py'), encoding='utf-8') as init_file:
-    release = re.search(r"version='(.+?)'", init_file.read()).group(1)
+with open(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', 'setup.cfg'), encoding='utf-8') as init_file:
+    release = re.search(r"version\s*=\s*(\S+)", init_file.read()).group(1)
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/test-expected/noapi-0-nomain-0/pyproject.toml b/test-expected/noapi-0-nomain-0/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel"]
diff --git a/test-expected/noapi-0-nomain-0/setup.cfg b/test-expected/noapi-0-nomain-0/setup.cfg
@@ -0,0 +1,30 @@
+[metadata]
+name = my-package
+version = 0.9.0
+url = https://github.com/johndoe/my-package
+author = John Doe
+author_email = [email protected]
+license = MIT
+description = my-package
+long_description = file:README.rst
+keywords = my-package
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    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
+    Topic :: Utilities
+
+[options]
+packages = my_package
+package_dir =
+    = src
+
+[options.entry_points]
+console_scripts =
+    my-package = my_package.main:main
diff --git a/test-expected/noapi-0-nomain-0/setup.py b/test-expected/noapi-0-nomain-0/setup.py
diff --git a/test-expected/noapi-nomain/pyproject.toml b/test-expected/noapi-nomain/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel"]
diff --git a/test-expected/noapi-nomain/setup.cfg b/test-expected/noapi-nomain/setup.cfg
@@ -0,0 +1,27 @@
+[metadata]
+name = my-package
+version = 0.9.0
+url = https://github.com/johndoe/my-package
+author = John Doe
+author_email = [email protected]
+license = MIT
+description = my-package
+long_description = file:README.md
+long_description_content_type = text/markdown; charset=UTF-8
+keywords = my-package
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    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
+    Topic :: Utilities
+
+[options]
+packages = my_package
+package_dir =
+    = src
diff --git a/test-expected/noapi-nomain/setup.py b/test-expected/noapi-nomain/setup.py
diff --git a/test-expected/noapi/pyproject.toml b/test-expected/noapi/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel"]
diff --git a/test-expected/noapi/setup.cfg b/test-expected/noapi/setup.cfg
@@ -0,0 +1,31 @@
+[metadata]
+name = my-package
+version = 0.9.0
+url = https://github.com/johndoe/my-package
+author = John Doe
+author_email = [email protected]
+license = MIT
+description = my-package
+long_description = file:README.md
+long_description_content_type = text/markdown; charset=UTF-8
+keywords = my-package
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    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
+    Topic :: Utilities
+
+[options]
+packages = my_package
+package_dir =
+    = src
+
+[options.entry_points]
+console_scripts =
+    my-package = my_package.main:main
diff --git a/test-expected/noapi/setup.py b/test-expected/noapi/setup.py
diff --git a/test-expected/nomain/doc/conf.py b/test-expected/nomain/doc/conf.py
@@ -24,8 +24,8 @@
 # The full version, including alpha/beta/rc tags
 import os
 import re
-with open(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', 'setup.py'), encoding='utf-8') as init_file:
-    release = re.search(r"version='(.+?)'", init_file.read()).group(1)
+with open(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', 'setup.cfg'), encoding='utf-8') as init_file:
+    release = re.search(r"version\s*=\s*(\S+)", init_file.read()).group(1)
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/test-expected/nomain/pyproject.toml b/test-expected/nomain/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel"]